diff options
| author | Bernhard Kaindl <contact@bernhard.kaindl.dev> | 2024-10-09 03:04:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-08 19:04:10 -0600 |
| commit | 0f3fea511e9aa3c41934531c518f57e1397b9731 (patch) | |
| tree | 0f261b1e6f826299f8ca3d5523859e13c68c9b04 | |
| parent | a0611650e2b8d915d18802c19cbe404f90349abb (diff) | |
| download | spack-0f3fea511e9aa3c41934531c518f57e1397b9731.tar.gz spack-0f3fea511e9aa3c41934531c518f57e1397b9731.tar.bz2 spack-0f3fea511e9aa3c41934531c518f57e1397b9731.tar.xz spack-0f3fea511e9aa3c41934531c518f57e1397b9731.zip | |
gettext: Fix ~libxml2: Skip patch for external libxml (#46870)
| -rw-r--r-- | var/spack/repos/builtin/packages/gettext/package.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/gettext/package.py b/var/spack/repos/builtin/packages/gettext/package.py index 04a0ad7b39..f60f26c88c 100644 --- a/var/spack/repos/builtin/packages/gettext/package.py +++ b/var/spack/repos/builtin/packages/gettext/package.py @@ -31,8 +31,8 @@ class Gettext(AutotoolsPackage, GNUMirrorPackage): version("0.19.8.1", sha256="105556dbc5c3fbbc2aa0edb46d22d055748b6f5c7cd7a8d99f8e7eb84e938be4") version("0.19.7", sha256="378fa86a091cec3acdece3c961bb8d8c0689906287809a8daa79dc0c6398d934") - depends_on("c", type="build") # generated - depends_on("cxx", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") # Recommended variants variant("curses", default=True, description="Use libncurses") @@ -83,7 +83,7 @@ class Gettext(AutotoolsPackage, GNUMirrorPackage): # From the configure script: "we don't want to use an external libxml, because its # dependencies and their dynamic relocations have an impact on the startup time", well, # *we* do. - if self.spec.satisfies("@0.20:"): # libtextstyle/configure not present prior + if self.spec.satisfies("@0.20:+libxml2"): # libtextstyle/configure not present prior filter_file( "gl_cv_libxml_force_included=yes", "gl_cv_libxml_force_included=no", @@ -93,7 +93,7 @@ class Gettext(AutotoolsPackage, GNUMirrorPackage): def flag_handler(self, name, flags): # this goes together with gl_cv_libxml_force_included=no - if name == "ldflags": + if name == "ldflags" and self.spec.satisfies("+libxml2"): flags.append("-lxml2") return (flags, None, None) |