diff options
| author | Alex Richert <82525672+AlexanderRichert-NOAA@users.noreply.github.com> | 2023-10-08 08:42:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-08 17:42:21 +0200 |
| commit | 8089aedde11bc2aa0ae5bd478bde01b0960ccbd2 (patch) | |
| tree | cc47bdb5c5fde5d3c31ded6a73a21159f82011a0 | |
| parent | 6b9e10330504da08703170ac71a8e22b94355fef (diff) | |
| download | spack-8089aedde11bc2aa0ae5bd478bde01b0960ccbd2.tar.gz spack-8089aedde11bc2aa0ae5bd478bde01b0960ccbd2.tar.bz2 spack-8089aedde11bc2aa0ae5bd478bde01b0960ccbd2.tar.xz spack-8089aedde11bc2aa0ae5bd478bde01b0960ccbd2.zip | |
gettext: Add static and pic options (#37957)
| -rw-r--r-- | var/spack/repos/builtin/packages/gettext/package.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/gettext/package.py b/var/spack/repos/builtin/packages/gettext/package.py index 4ae7eb59d9..d7cccfb339 100644 --- a/var/spack/repos/builtin/packages/gettext/package.py +++ b/var/spack/repos/builtin/packages/gettext/package.py @@ -33,6 +33,8 @@ class Gettext(AutotoolsPackage, GNUMirrorPackage): variant("tar", default=True, description="Enable tar support") variant("bzip2", default=True, description="Enable bzip2 support") variant("xz", default=True, description="Enable xz support") + variant("shared", default=True, description="Build shared libraries") + variant("pic", default=True, description="Enable position-independent code (PIC)") # Optional variants variant("libunistring", default=False, description="Use libunistring") @@ -54,6 +56,8 @@ class Gettext(AutotoolsPackage, GNUMirrorPackage): depends_on("libunistring", when="+libunistring") # depends_on('cvs') + conflicts("+shared~pic") + patch("test-verify-parallel-make-check.patch", when="@:0.19.8.1") patch("nvhpc-builtin.patch", when="@:0.21.0 %nvhpc") patch("nvhpc-export-symbols.patch", when="%nvhpc") @@ -87,6 +91,8 @@ class Gettext(AutotoolsPackage, GNUMirrorPackage): "--without-cvs", ] + config_args.extend(self.enable_or_disable("shared")) + if self.spec["iconv"].name == "libc": config_args.append("--without-libiconv-prefix") elif not is_system_path(self.spec["iconv"].prefix): @@ -115,12 +121,16 @@ class Gettext(AutotoolsPackage, GNUMirrorPackage): else: config_args.append("--with-included-libunistring") + config_args.extend(self.with_or_without("pic")) + return config_args @property def libs(self): - return find_libraries( + libs = find_libraries( ["libasprintf", "libgettextlib", "libgettextpo", "libgettextsrc", "libintl"], root=self.prefix, recursive=True, + shared=self.spec.variants["shared"].value, ) + return libs |