From f7ed3ce4ae12a250920a4805ccd1c3224c8c8d28 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Wed, 23 Apr 2025 19:07:19 +0200 Subject: [PATCH] py-pillow: fix build (#50177) --- .../builtin/packages/py-pillow/package.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-pillow/package.py b/var/spack/repos/builtin/packages/py-pillow/package.py index 55f3f11ecda..f2f9e1eeab4 100644 --- a/var/spack/repos/builtin/packages/py-pillow/package.py +++ b/var/spack/repos/builtin/packages/py-pillow/package.py @@ -125,18 +125,17 @@ def patch(self): ) if self.spec.satisfies("@:9"): - - def variant_to_cfg(variant): - able = "enable" if "+" + variant in self.spec else "disable" - return "{0}_{1}=1\n".format(able, variant) - with open("setup.cfg", "a") as setup: - setup.write("[build_ext]\n") - for variant in self.VARIANTS: - setup.write(variant_to_cfg(variant)) + print("[build_ext]", file=setup) - setup.write("rpath={0}\n".format(":".join(self.rpath))) - setup.write("[install]\n") + for variant in self.VARIANTS: + if self.spec.satisfies(f"+{variant}"): + print(f"enable_{variant}=1", file=setup) + elif self.spec.satisfies(f"~{variant}"): + print(f"disable_{variant}=1", file=setup) + + print("rpath={0}".format(":".join(self.rpath)), file=setup) + print("[install]", file=setup) @when("@:9") def setup_build_environment(self, env: EnvironmentModifications) -> None: