hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

glib: add 2.74.0 and 2.72.4 (#33332)

Browse source
This commit is contained in:
Michael Kuhn 2022-10-15 05:27:08 +02:00 committed by GitHub
parent 19226ecc49
commit 31cda96181
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
var/spack/repos/builtin/packages/glib/package.py
View file

@ -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 @@ def libs(self):
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")