Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix gettext patch #472

Merged
merged 2 commits into from
Sep 3, 2024
Merged

Fix gettext patch #472

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e09351
Package/gettext: Old version issues (#44440)
teaguesterling May 30, 2024
52c7c02
gettext: fix condition (#44680)
teaguesterling Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions var/spack/repos/builtin/packages/gettext/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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("@20:"): # libtextstyle/configure not present prior
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
Expand Down
Loading