diff options
| author | Alex Richert <82525672+AlexanderRichert-NOAA@users.noreply.github.com> | 2023-05-27 09:24:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-27 11:24:27 -0500 |
| commit | fcd49f2f08b45cdab01e98ea141a0682599f9bd5 (patch) | |
| tree | d2fb323798df8608724270c4c5afa7da4163ca35 | |
| parent | b3268c2703b84f4e4961c1e2cdf43e8998f283e6 (diff) | |
| download | spack-fcd49f2f08b45cdab01e98ea141a0682599f9bd5.tar.gz spack-fcd49f2f08b45cdab01e98ea141a0682599f9bd5.tar.bz2 spack-fcd49f2f08b45cdab01e98ea141a0682599f9bd5.tar.xz spack-fcd49f2f08b45cdab01e98ea141a0682599f9bd5.zip | |
Add shared and pic variants to libtiff (#37965)
* Add static-only option for libtiff
* update libtiff to add pic variant
* fix libtiff pic setting
| -rw-r--r-- | var/spack/repos/builtin/packages/libtiff/package.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/libtiff/package.py b/var/spack/repos/builtin/packages/libtiff/package.py index 5fc01167aa..58f6b6171b 100644 --- a/var/spack/repos/builtin/packages/libtiff/package.py +++ b/var/spack/repos/builtin/packages/libtiff/package.py @@ -75,6 +75,9 @@ class Libtiff(CMakePackage, AutotoolsPackage): build_system(conditional("cmake", when="@4.0.5:"), "autotools", default="cmake") + variant("shared", default=True, description="Build shared") + variant("pic", default=False, description="Enable position-independent code (PIC)") + with when("build_system=cmake"): depends_on("cmake@3.9:", when="@4.3:", type="build") depends_on("cmake@2.8.11:", when="@4.0.10:4.2", type="build") @@ -112,6 +115,8 @@ class CMakeBuilder(CMakeBuilder): def cmake_args(self): args = [self.define_from_variant(var) for var in VARIANTS] args.append("-Dsphinx=OFF") + args += [self.define_from_variant("BUILD_SHARED_LIBS", "shared")] + args += [self.define_from_variant("CMAKE_POSITION_INDEPENDENT_CODE", "pic")] # Remove empty strings args = [arg for arg in args if arg] @@ -124,6 +129,10 @@ class AutotoolsBuilder(AutotoolsBuilder): args = [] for var in VARIANTS: args.extend(self.enable_or_disable(var)) + args.append("--disable-sphinx") + args.extend(self.enable_or_disable("shared")) + args.extend(self.with_or_without("pic")) + return args |