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

openldap: fix build (#48646)

Browse Source
This commit is contained in:
Harmen Stoppels 2025-01-20 13:16:52 +01:00 committed by GitHub
parent c623448f81
commit 0c6f0c090d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
var/spack/repos/builtin/packages/cyrus-sasl/package.py
View File

@ -30,10 +30,12 @@ class CyrusSasl(AutotoolsPackage):
) )
conflicts("%gcc@14:", when="@:2.1.26") conflicts("%gcc@14:", when="@:2.1.26")
depends_on("c", type="build") # generated depends_on("c", type="build")
depends_on("m4", type="build") depends_on("m4", type="build")
depends_on("autoconf", type="build") depends_on("autoconf", type="build")
depends_on("automake", type="build") depends_on("automake", type="build")
depends_on("libtool", type="build") depends_on("libtool", type="build")
depends_on("groff", type="build") depends_on("groff", type="build")
depends_on("openssl", type="link")
depends_on("libxcrypt", type="link")

42
var/spack/repos/builtin/packages/openldap/package.py
View File

@ -50,17 +50,22 @@ class Openldap(AutotoolsPackage):
conflicts("~static", when="~shared") conflicts("~static", when="~shared")
depends_on("icu4c", when="+icu") depends_on("icu4c", when="+icu")
depends_on("gnutls", when="~client_only tls=gnutls")
depends_on("openssl", when="~client_only tls=openssl") with when("~client_only"):
depends_on("openssl@1.1.1:", when="~client_only tls=openssl @2.6.0:") depends_on("gnutls", when="tls=gnutls")
depends_on("unixodbc", when="~client_only") depends_on("openssl", when="tls=openssl")
depends_on("postgresql", when="~client_only") depends_on("openssl@1.1.1:", when="tls=openssl @2.6.0:")
depends_on("berkeley-db", when="~client_only") # for slapd depends_on("unixodbc")
depends_on("postgresql")
depends_on("berkeley-db") # for slapd
depends_on("libtool", type="link") # links against libltdl
depends_on("libxcrypt", type="link")
depends_on("perl", when="~client_only+perl") # for slapd
# depends_on('openslp', when='~client_only') # not avail. in spack yet
# depends_on('Pth', when='~client_only') # not avail. in spack yet
# Recommended dependencies by Linux From Scratch # Recommended dependencies by Linux From Scratch
depends_on("cyrus-sasl", when="+sasl") depends_on("cyrus-sasl", when="+sasl")
# depends_on('openslp', when='~client_only') # not avail. in spack yet
# depends_on('Pth', when='~client_only') # not avail. in spack yet
depends_on("perl", when="~client_only+perl") # for slapd
depends_on("groff", type="build") depends_on("groff", type="build")
depends_on("pkgconfig", type="build") depends_on("pkgconfig", type="build")
depends_on("wiredtiger", when="@2.6.0:") depends_on("wiredtiger", when="@2.6.0:")
@ -94,24 +99,21 @@ def configure_args(self):
"--enable-backends=mod", "--enable-backends=mod",
"--disable-sql", "--disable-sql",
"--enable-overlays=mod", "--enable-overlays=mod",
f"--with-tls={self.spec.variants['tls'].value}",
*self.enable_or_disable("static"),
*self.enable_or_disable("shared"),
*self.enable_or_disable("dynamic"),
*self.with_or_without("cyrus-sasl", variant="sasl"),
*self.enable_or_disable("perl"),
*self.enable_or_disable("wt"),
] ]
if self.spec.satisfies("@:2.5"): if self.spec.satisfies("@:2.5"):
args.extend(("--disable-ndb", "--disable-shell", "--disable-bdb", "--disable-hdb")) args += ["--disable-ndb", "--disable-shell", "--disable-bdb", "--disable-hdb"]
args += self.enable_or_disable("static")
args += self.enable_or_disable("shared")
args += self.enable_or_disable("dynamic")
args += self.with_or_without("cyrus-sasl", variant="sasl")
args.append("--with-tls=" + self.spec.variants["tls"].value)
if self.spec.satisfies("@2.6.0: tls=gnutls"): if self.spec.satisfies("@2.6.0: tls=gnutls"):
args += ["--disable-autoca"] args += ["--disable-autoca"]
if self.spec.satisfies("@2.5.0:"):
args += self.enable_or_disable("wt")
args += self.enable_or_disable("perl")
return args return args
def build(self, spec, prefix): def build(self, spec, prefix):