From 5c3a23a481938e59e495cf1fd4e9d45899a4d23a Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Mon, 15 Jul 2024 17:36:45 -0700 Subject: pixman: add shared, pic variants (#44889) * Add shared/pic variants to pixman * add +shared~pic conflict --- var/spack/repos/builtin/packages/pixman/package.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/pixman/package.py b/var/spack/repos/builtin/packages/pixman/package.py index e64568f595..adabe3afb3 100644 --- a/var/spack/repos/builtin/packages/pixman/package.py +++ b/var/spack/repos/builtin/packages/pixman/package.py @@ -31,6 +31,11 @@ class Pixman(AutotoolsPackage): depends_on("bison@3:", type="build") depends_on("libpng") + variant("shared", default=True, description="Build shared library") + variant("pic", default=False, description="Enable position-independent code") + + conflicts("+shared ~pic") + # As discussed here: # https://bugs.freedesktop.org/show_bug.cgi?id=104886 # __builtin_shuffle was removed in clang 5.0. @@ -60,7 +65,9 @@ class Pixman(AutotoolsPackage): @property def libs(self): - return find_libraries("libpixman-1", self.prefix, shared=True, recursive=True) + return find_libraries( + "libpixman-1", self.prefix, shared=self.spec.satisfies("+shared"), recursive=True + ) def configure_args(self): args = ["--enable-libpng", "--disable-gtk"] @@ -78,4 +85,7 @@ class Pixman(AutotoolsPackage): if self.spec.satisfies("%fj"): args.append("--disable-arm-a64-neon") + args.extend(self.enable_or_disable("shared")) + args.extend(self.with_or_without("pic")) + return args -- cgit v1.2.3-70-g09d2