summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarmen Stoppels <me@harmenstoppels.nl>2023-11-14 17:44:48 +0100
committerGitHub <noreply@github.com>2023-11-14 17:44:48 +0100
commit25eca56909b0e51ebc7a347214016af9bcb3430a (patch)
tree5469130a55a728a921a64a5f1a70974c79ee8cdd
parent2ac128a3adfc0916f3745fdbe18b798eddc29763 (diff)
downloadspack-25eca56909b0e51ebc7a347214016af9bcb3430a.tar.gz
spack-25eca56909b0e51ebc7a347214016af9bcb3430a.tar.bz2
spack-25eca56909b0e51ebc7a347214016af9bcb3430a.tar.xz
spack-25eca56909b0e51ebc7a347214016af9bcb3430a.zip
gmake: fix bootstrap (#41060)
-rw-r--r--var/spack/repos/builtin/packages/bzip2/package.py4
-rw-r--r--var/spack/repos/builtin/packages/gmake/package.py2
-rw-r--r--var/spack/repos/builtin/packages/openssl/package.py4
3 files changed, 10 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/bzip2/package.py b/var/spack/repos/builtin/packages/bzip2/package.py
index 58f598ac15..e3c618bb30 100644
--- a/var/spack/repos/builtin/packages/bzip2/package.py
+++ b/var/spack/repos/builtin/packages/bzip2/package.py
@@ -44,6 +44,10 @@ class Bzip2(Package, SourcewarePackage):
if sys.platform != "win32":
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
def determine_version(cls, exe):
output = Executable(exe)("--help", output=str, error=str)
diff --git a/var/spack/repos/builtin/packages/gmake/package.py b/var/spack/repos/builtin/packages/gmake/package.py
index 0cfbccb80e..29469758c5 100644
--- a/var/spack/repos/builtin/packages/gmake/package.py
+++ b/var/spack/repos/builtin/packages/gmake/package.py
@@ -67,6 +67,8 @@ class Gmake(Package, GNUMirrorPackage):
return [
"--with-guile" if self.spec.satisfies("+guile") else "--without-guile",
"--disable-nls",
+ # configure needs make to enable dependency tracking, disable explicitly
+ "--disable-dependency-tracking",
]
def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py
index 358a008088..8e2cd947bb 100644
--- a/var/spack/repos/builtin/packages/openssl/package.py
+++ b/var/spack/repos/builtin/packages/openssl/package.py
@@ -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("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(
"https://github.com/openssl/openssl/commit/f9e578e720bb35228948564192adbe3bc503d5fb.patch?full_index=1",
sha256="3fdcf2d1e47c34f3a012f23306322c5a35cad55b180c9b6fb34537b55884645c",