diff options
| author | Michael Kuhn <michael.kuhn@ovgu.de> | 2022-10-15 05:27:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-14 21:27:08 -0600 |
| commit | 31cda96181c27889782ed48a091bc4c683bf1254 (patch) | |
| tree | cb16c4e2f56e05efe0c22653dbaae20122650368 | |
| parent | 19226ecc49be26df5af4ad1c4ea950a5b5e48d4c (diff) | |
| download | spack-31cda96181c27889782ed48a091bc4c683bf1254.tar.gz spack-31cda96181c27889782ed48a091bc4c683bf1254.tar.bz2 spack-31cda96181c27889782ed48a091bc4c683bf1254.tar.xz spack-31cda96181c27889782ed48a091bc4c683bf1254.zip | |
glib: add 2.74.0 and 2.72.4 (#33332)
| -rw-r--r-- | var/spack/repos/builtin/packages/glib/package.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index 83dfb307b2..a7d9c43ef6 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -23,6 +23,8 @@ class Glib(Package): maintainers = ["michaelkuhn"] + version("2.74.0", sha256="3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30") + version("2.72.4", sha256="8848aba518ba2f4217d144307a1d6cb9afcc92b54e5c13ac1f8c4d4608e96f0e") version("2.72.3", sha256="4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0") version("2.72.2", sha256="78d599a133dba7fe2036dfa8db8fb6131ab9642783fc9578b07a20995252d2de") version("2.72.1", sha256="c07e57147b254cef92ce80a0378dc0c02a4358e7de4702e9f403069781095fe2") @@ -137,7 +139,7 @@ class Glib(Package): # glib prefers the libc version of gettext, which breaks the build if the # external version is also found. patch("meson-gettext.patch", when="@2.58:2.64") - patch("meson-gettext-2.66.patch", when="@2.66:2.68,2.72:") + patch("meson-gettext-2.66.patch", when="@2.66:2.68,2.72") patch("meson-gettext-2.70.patch", when="@2.70") def url_for_version(self, version): @@ -162,7 +164,9 @@ class Glib(Package): return find_libraries(["libglib*"], root=self.prefix, recursive=True) def meson_args(self): - args = ["-Dgettext=external"] + args = [] + if self.spec.satisfies("@:2.72"): + args.append("-Dgettext=external") if self.spec.satisfies("@2.63.5:"): if "+libmount" in self.spec: args.append("-Dlibmount=enabled") |