[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (aff5cfb1f7b18e2e3bdd1c2aa1420f0f94aefdd8)
Vlad Glagolev
scm at sourcemage.org
Fri Jun 24 10:07:48 EDT 2011
GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:
gnome2-libs/glib2/DEPENDS | 8 ++++++++
gnome2-libs/glib2/HISTORY | 3 +++
2 files changed, 11 insertions(+)
New commits:
commit aff5cfb1f7b18e2e3bdd1c2aa1420f0f94aefdd8
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>
glib2: force pcre build when needed
diff --git a/gnome2-libs/glib2/DEPENDS b/gnome2-libs/glib2/DEPENDS
index fe57abb..3a38f8d 100755
--- a/gnome2-libs/glib2/DEPENDS
+++ b/gnome2-libs/glib2/DEPENDS
@@ -1,3 +1,5 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
depends pkgconfig &&
if ! spell_installed pkgconfig; then
@@ -21,6 +23,12 @@ optional_depends -sub UTFPROP pcre \
"--with-pcre=internal" \
"Use system supplied PCRE. Otherwise, the internal PCRE library will be used" &&
+if is_depends_enabled $SPELL pcre; then
+ if spell_ok pcre && is_version_less $(installed_version pcre) 8.11; then
+ force_depends pcre
+ fi
+fi &&
+
optional_depends libselinux \
"--enable-selinux" \
"--disable-selinux" \
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 1a0509f..b61b6d1 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,6 @@
+2011-06-24 Vlad Glagolev <stealth at sourcemage.org>
+ * DEPENDS: force pcre version when needed
+
2011-06-06 Ladislav Hagara <hgr at vabo.cz>
* DETAILS: 2.28.8
More information about the SM-Commit
mailing list