New commits:
commit e016697fee02b59c9662ba98e8a525bbc406006d
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
glibc: trigger xlocale recast for all updates over 2.26, not just from
2.25
I had glibc 2.24 installed. Update to 2.26 broke things. No trigger.
commit cac6154e0d696fb68505325a8b05f377f24b0d3f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
glibc: also trigger icu for xlocale.h change
commit 77c5c610e20ddc3ca2e62e4ff70eedef99fad544
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
icu: fix build with glibc-2.26
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 5d0b1d9..5f6b58e 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,7 @@
+2017-09-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * UP_TRIGGERS: add icu to the xlocale.h offenders,
+ also trigger on any update crossing 2.26
+
2017-08-16 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Force gcc to be built if major version upgrade
e.g. gcc 4.6.4 (stable-0.62-10) -> gcc 7.2.0 (test-0.63)
diff --git a/libs/glibc/UP_TRIGGERS b/libs/glibc/UP_TRIGGERS
index 58b8194..364574d 100755
--- a/libs/glibc/UP_TRIGGERS
+++ b/libs/glibc/UP_TRIGGERS
@@ -1,3 +1,5 @@
+. "$GRIMOIRE/FUNCTIONS"
+
if ! spell_ok locale; then
up_trigger locale cast_self
echo
@@ -11,8 +13,9 @@ fi
# See https://bugzilla.redhat.com/show_bug.cgi?id=1464244 for perl
local OLD_SPELL_VERSION=""
spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
-if [ "x${OLD_SPELL_VERSION}" == "x2.25" ] && [ "x${VERSION}" !=
"x${OLD_SPELL_VERSION}" ]; then
- for each in gsoap matplotlib numpy perl qjson scipy weechat; do
+if is_version_less $OLD_SPELL_VERSION $VERSION &&
+ is_version_less $OLD_SPELL_VERSION 2.26; then
+ for each in gsoap matplotlib numpy perl qjson scipy weechat icu; do
if spell_ok $each; then
up_trigger $each cast_self
fi
diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index 513af30..0ac42f0 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -1,3 +1,6 @@
+2017-09-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * xlocale.patch, PRE_BUILD: fix build with glibc-2.26
+
2017-08-16 Eric Sandall <sandalle AT sourcemage.org>
* collation.patch: Strip trailing CRs