zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openblas and others: change flag_handler idiom to respect incoming flags (#46211)

Browse Source 
* openblas: fix flag_handler to respect flags

* arpack-ng: fix flag_handler to respect flags

* czmq: fix flag_handler to respect flags

* flex: fix flag_handler to respect flags

* json-c: fix flag_handler to respect flags

* mpifileutils: fix flag_handler to respect flags

* netlib-scalapack: fix flag_handler to respect flags

* sed: fix flag_handler to respect flags

---------

Co-authored-by: Harmen Stoppels <me@harmenstoppels.nl>
This commit is contained in:
Greg Becker 2024-09-16 09:14:24 -07:00 committed by GitHub
parent 61d6c5486c
commit f4f59b7f18
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
var/spack/repos/builtin/packages/arpack-ng/package.py
View File

@ -93,16 +93,15 @@ class ArpackNg(CMakePackage, AutotoolsPackage):
def flag_handler(self, name, flags): def flag_handler(self, name, flags):
spec = self.spec spec = self.spec
iflags = []
if name == "cflags": if name == "cflags":
if spec.satisfies("%oneapi"): if spec.satisfies("%oneapi"):
iflags.append("-Wno-error=implicit-function-declaration") flags.append("-Wno-error=implicit-function-declaration")
if name == "fflags": if name == "fflags":
if self.spec.satisfies("%cce"): if self.spec.satisfies("%cce"):
iflags.append("-hnopattern") flags.append("-hnopattern")
return (iflags, None, None) return (flags, None, None)
@property @property
def libs(self): def libs(self):

7
var/spack/repos/builtin/packages/czmq/package.py
View File

@ -32,12 +32,11 @@ class Czmq(AutotoolsPackage):
depends_on("libzmq") depends_on("libzmq")
def flag_handler(self, name, flags): def flag_handler(self, name, flags):
iflags = []
if name == "cflags": if name == "cflags":
if self.spec.satisfies("%oneapi@2022.2.0:"): if self.spec.satisfies("%oneapi@2022.2.0:"):
iflags.append("-Wno-error=gnu-null-pointer-arithmetic") flags.append("-Wno-error=gnu-null-pointer-arithmetic")
iflags.append("-Wno-error=strict-prototypes") flags.append("-Wno-error=strict-prototypes")
return (iflags, None, None) return (flags, None, None)
def autoreconf(self, spec, prefix): def autoreconf(self, spec, prefix):
autogen = Executable("./autogen.sh") autogen = Executable("./autogen.sh")

5
var/spack/repos/builtin/packages/flex/package.py
View File

@ -65,11 +65,10 @@ class Flex(AutotoolsPackage):
def flag_handler(self, name, flags): def flag_handler(self, name, flags):
spec = self.spec spec = self.spec
iflags = []
if name == "cflags": if name == "cflags":
if spec.satisfies("%oneapi"): if spec.satisfies("%oneapi"):
iflags.append("-Wno-error=implicit-function-declaration") flags.append("-Wno-error=implicit-function-declaration")
return (iflags, None, None) return (flags, None, None)
@classmethod @classmethod
def determine_version(cls, exe): def determine_version(cls, exe):

5
var/spack/repos/builtin/packages/json-c/package.py
View File

@ -48,11 +48,10 @@ def patch(self):
filter_file("-Werror", "", "CMakeLists.txt") filter_file("-Werror", "", "CMakeLists.txt")
def flag_handler(self, name, flags): def flag_handler(self, name, flags):
iflags = []
if name == "cflags": if name == "cflags":
if self.spec.satisfies("%oneapi"): if self.spec.satisfies("%oneapi"):
iflags.append("-Wno-error=implicit-function-declaration") flags.append("-Wno-error=implicit-function-declaration")
return (iflags, None, None) return (flags, None, None)
@run_after("install") @run_after("install")
def darwin_fix(self): def darwin_fix(self):

5
var/spack/repos/builtin/packages/mpifileutils/package.py
View File

@ -65,11 +65,10 @@ class Mpifileutils(CMakePackage):
def flag_handler(self, name, flags): def flag_handler(self, name, flags):
spec = self.spec spec = self.spec
iflags = []
if name == "cflags": if name == "cflags":
if spec.satisfies("%oneapi"): if spec.satisfies("%oneapi"):
iflags.append("-Wno-error=implicit-function-declaration") flags.append("-Wno-error=implicit-function-declaration")
return (iflags, None, None) return (flags, None, None)
def cmake_args(self): def cmake_args(self):
args = [ args = [

7
var/spack/repos/builtin/packages/netlib-scalapack/package.py
View File

@ -41,15 +41,14 @@ class ScalapackBase(CMakePackage):
patch("fix-build-macos.patch", when="@2.2.0") patch("fix-build-macos.patch", when="@2.2.0")
def flag_handler(self, name, flags): def flag_handler(self, name, flags):
iflags = []
if name == "cflags": if name == "cflags":
if self.spec.satisfies("%gcc@14:"): if self.spec.satisfies("%gcc@14:"):
# https://bugzilla.redhat.com/show_bug.cgi?id=2178710 # https://bugzilla.redhat.com/show_bug.cgi?id=2178710
iflags.append("-std=gnu89") flags.append("-std=gnu89")
elif name == "fflags": elif name == "fflags":
if self.spec.satisfies("%cce"): if self.spec.satisfies("%cce"):
iflags.append("-hnopattern") flags.append("-hnopattern")
return (iflags, None, None) return (flags, None, None)
@property @property
def libs(self): def libs(self):

5
var/spack/repos/builtin/packages/openblas/package.py
View File

@ -270,11 +270,10 @@ class Openblas(CMakePackage, MakefilePackage):
def flag_handler(self, name, flags): def flag_handler(self, name, flags):
spec = self.spec spec = self.spec
iflags = []
if name == "cflags": if name == "cflags":
if spec.satisfies("@0.3.20: %oneapi") or spec.satisfies("@0.3.20: %arm"): if spec.satisfies("@0.3.20: %oneapi") or spec.satisfies("@0.3.20: %arm"):
iflags.append("-Wno-error=implicit-function-declaration") flags.append("-Wno-error=implicit-function-declaration")
return (iflags, None, None) return (flags, None, None)
@classmethod @classmethod
def determine_version(cls, lib): def determine_version(cls, lib):

5
var/spack/repos/builtin/packages/sed/package.py
View File

@ -44,8 +44,7 @@ def determine_version(cls, exe):
return match.group(1) if match else None return match.group(1) if match else None
def flag_handler(self, name, flags): def flag_handler(self, name, flags):
iflags = []
if name == "cflags": if name == "cflags":
if self.spec.satisfies("%oneapi@2023.0.0:"): if self.spec.satisfies("%oneapi@2023.0.0:"):
iflags.append("-Wno-error=incompatible-function-pointer-types") flags.append("-Wno-error=incompatible-function-pointer-types")
return (iflags, None, None) return (flags, None, None)