From 1e0935186d63be2e3c7a722d93879666d3bd48c3 Mon Sep 17 00:00:00 2001 From: Teague Sterling Date: Thu, 30 May 2024 11:35:20 -0700 Subject: [PATCH 1/2] Package/gettext: Old version issues (#44440) gcc@:5 hits https://savannah.gnu.org/bugs/index.php?65811 in gettext@0.22: also fix patch of configure script Co-authored-by: Harmen Stoppels --- .../repos/builtin/packages/gettext/package.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/var/spack/repos/builtin/packages/gettext/package.py b/var/spack/repos/builtin/packages/gettext/package.py index d485aaf82d7431..479b97ea4b721b 100644 --- a/var/spack/repos/builtin/packages/gettext/package.py +++ b/var/spack/repos/builtin/packages/gettext/package.py @@ -62,6 +62,8 @@ class Gettext(AutotoolsPackage, GNUMirrorPackage): # depends_on('cvs') conflicts("+shared~pic") + # https://savannah.gnu.org/bugs/?65811 + conflicts("%gcc@:5", when="@0.22:") patch("test-verify-parallel-make-check.patch", when="@:0.19.8.1") patch("nvhpc-builtin.patch", when="@:0.21.0 %nvhpc") @@ -78,12 +80,13 @@ def patch(self): # 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. - filter_file( - "gl_cv_libxml_force_included=yes", - "gl_cv_libxml_force_included=no", - "libtextstyle/configure", - string=True, - ) + if self.spec.satisfies("@:19"): # libtextstyle/configure not present + filter_file( + "gl_cv_libxml_force_included=yes", + "gl_cv_libxml_force_included=no", + "libtextstyle/configure", + string=True, + ) def flag_handler(self, name, flags): # this goes together with gl_cv_libxml_force_included=no From 52c7c0237c2f9f2495987076ffb9527ecd802651 Mon Sep 17 00:00:00 2001 From: Teague Sterling Date: Wed, 12 Jun 2024 12:24:42 -0700 Subject: [PATCH 2/2] gettext: fix condition (#44680) --- var/spack/repos/builtin/packages/gettext/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/gettext/package.py b/var/spack/repos/builtin/packages/gettext/package.py index 479b97ea4b721b..b4db62738ce4e0 100644 --- a/var/spack/repos/builtin/packages/gettext/package.py +++ b/var/spack/repos/builtin/packages/gettext/package.py @@ -80,7 +80,7 @@ def patch(self): # 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("@:19"): # libtextstyle/configure not present + if self.spec.satisfies("@20:"): # libtextstyle/configure not present prior filter_file( "gl_cv_libxml_force_included=yes", "gl_cv_libxml_force_included=no",