diff options
| author | Michael Kuhn <michael.kuhn@ovgu.de> | 2020-11-07 03:49:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-06 20:49:21 -0600 |
| commit | 010ad6011eebc9ae721115806a067a50d184b354 (patch) | |
| tree | b6f63fb9c286b226d044f4b511c7436d528deb8a | |
| parent | 07b1ddee234f8992e650dfd6167c3f9d613323a8 (diff) | |
| download | spack-010ad6011eebc9ae721115806a067a50d184b354.tar.gz spack-010ad6011eebc9ae721115806a067a50d184b354.tar.bz2 spack-010ad6011eebc9ae721115806a067a50d184b354.tar.xz spack-010ad6011eebc9ae721115806a067a50d184b354.zip | |
glib: add 2.66.2 and 2.64.6 (#19793)
| -rw-r--r-- | var/spack/repos/builtin/packages/glib/meson-gettext-2.66.patch | 30 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/glib/package.py | 5 |
2 files changed, 34 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/glib/meson-gettext-2.66.patch b/var/spack/repos/builtin/packages/glib/meson-gettext-2.66.patch new file mode 100644 index 0000000000..2d58f61889 --- /dev/null +++ b/var/spack/repos/builtin/packages/glib/meson-gettext-2.66.patch @@ -0,0 +1,30 @@ +--- a/meson.build ++++ b/meson.build +@@ -2003,9 +2003,10 @@ + # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible + # implementations. This could be extended if issues are found in some platforms. + libintl_deps = [] +-if cc.has_function('ngettext') ++gettext_opt = get_option('gettext') ++if ['auto', 'libc'].contains(gettext_opt) and cc.has_function('ngettext') + have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset') +-else ++elif ['auto', 'external'].contains(gettext_opt) + # First just find the bare library. + libintl = cc.find_library('intl', required : false) + # The bare library probably won't link without help if it's static. +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -9,6 +9,12 @@ + value : 'auto', + description : 'iconv implementation to use (\'libc\' = \'Part of the C library\'; \'external\' = \'External libiconv\'; \'auto\' = \'Auto-detect which iconv is available\')') + ++option('gettext', ++ type : 'combo', ++ choices : ['auto', 'libc', 'external'], ++ value : 'auto', ++ description : 'gettext implementation to use (\'libc\' = \'Part of the C library\'; \'external\' = \'External libintl\'; \'auto\' = \'Auto-detect which gettext is available\')') ++ + option('charsetalias_dir', + type : 'string', + value : '', diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index 786721565a..ce3ce0b8c9 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -21,6 +21,8 @@ class Glib(Package): homepage = "https://developer.gnome.org/glib/" url = "https://ftp.gnome.org/pub/gnome/sources/glib/2.53/glib-2.53.1.tar.xz" + version('2.66.2', sha256='ec390bed4e8dd0f89e918f385e8d4cfd7470b1ef7c1ce93ec5c4fc6e3c6a17c4') + version('2.64.6', sha256='c36ee07a70164c71f046016fe6aaacd6368333c42590bc0cba47c344ffb853f1') version('2.64.5', sha256='9cbd5bd2715ead1c28d53c46f7b7b6ff6166f5887b772c1a9e3bf2910cfecc11') version('2.64.4', sha256='f7e0b325b272281f0462e0f7fff25a833820cac19911ff677251daf6d87bce50') version('2.64.3', sha256='fe9cbc97925d14c804935f067a3ad77ef55c0bbe9befe68962318f5a767ceb22') @@ -73,7 +75,8 @@ 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.0:') + patch('meson-gettext.patch', when='@2.58:2.64') + patch('meson-gettext-2.66.patch', when='@2.66:') def url_for_version(self, version): """Handle glib's version-based custom URLs.""" |