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

gmake: fix bootstrap (#41060)

Browse Source
This commit is contained in:
Harmen Stoppels
2023-11-14 17:44:48 +01:00
committed by GitHub
parent 2ac128a3ad
commit 25eca56909
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
var/spack/repos/builtin/packages/bzip2/package.py
View File

@@ -44,6 +44,10 @@ class Bzip2(Package, SourcewarePackage):
if sys.platform != "win32": if sys.platform != "win32":
depends_on("diffutils", type="build") depends_on("diffutils", type="build")
depends_on("gmake", type="build", when="platform=linux")
depends_on("gmake", type="build", when="platform=cray")
depends_on("gmake", type="build", when="platform=darwin")
@classmethod @classmethod
def determine_version(cls, exe): def determine_version(cls, exe):
output = Executable(exe)("--help", output=str, error=str) output = Executable(exe)("--help", output=str, error=str)

2
var/spack/repos/builtin/packages/gmake/package.py
View File

@@ -67,6 +67,8 @@ def configure_args(self):
return [ return [
"--with-guile" if self.spec.satisfies("+guile") else "--without-guile", "--with-guile" if self.spec.satisfies("+guile") else "--without-guile",
"--disable-nls", "--disable-nls",
# configure needs make to enable dependency tracking, disable explicitly
"--disable-dependency-tracking",
] ]
def install(self, spec, prefix): def install(self, spec, prefix):

4
var/spack/repos/builtin/packages/openssl/package.py
View File

@@ -381,6 +381,10 @@ class Openssl(Package): # Uses Fake Autotools, should subclass Package
depends_on("ca-certificates-mozilla", type="build", when="certs=mozilla") depends_on("ca-certificates-mozilla", type="build", when="certs=mozilla")
depends_on("nasm", when="platform=windows") depends_on("nasm", when="platform=windows")
depends_on("gmake", type="build", when="platform=linux")
depends_on("gmake", type="build", when="platform=cray")
depends_on("gmake", type="build", when="platform=darwin")
patch( patch(
"https://github.com/openssl/openssl/commit/f9e578e720bb35228948564192adbe3bc503d5fb.patch?full_index=1", "https://github.com/openssl/openssl/commit/f9e578e720bb35228948564192adbe3bc503d5fb.patch?full_index=1",
sha256="3fdcf2d1e47c34f3a012f23306322c5a35cad55b180c9b6fb34537b55884645c", sha256="3fdcf2d1e47c34f3a012f23306322c5a35cad55b180c9b6fb34537b55884645c",