diff options
Diffstat (limited to 'devel/glib2/patches/patch-aa')
-rw-r--r-- | devel/glib2/patches/patch-aa | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa index 95ebd9d80e5..4e525680f8e 100644 --- a/devel/glib2/patches/patch-aa +++ b/devel/glib2/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.34 2007/08/15 22:09:13 tnn Exp $ +$NetBSD: patch-aa,v 1.35 2007/09/18 17:37:02 tnn Exp $ ---- configure.orig 2007-08-04 04:41:45.000000000 +0200 +--- configure.orig 2007-09-16 18:29:44.000000000 +0200 +++ configure @@ -929,6 +929,7 @@ G_MODULE_PLUGIN_LIBS G_MODULE_LDFLAGS @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.34 2007/08/15 22:09:13 tnn Exp $ G_MODULE_NEED_USCORE GLIB_DEBUG_FLAGS GSPAWN -@@ -36706,6 +36707,7 @@ else +@@ -36702,6 +36703,7 @@ else fi G_MODULE_NEED_USCORE=0 G_MODULE_BROKEN_RTLD_GLOBAL=0 @@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.34 2007/08/15 22:09:13 tnn Exp $ G_MODULE_HAVE_DLERROR=0 if test -z "$G_MODULE_IMPL"; then case "$host" in -@@ -37629,6 +37631,84 @@ fi +@@ -37625,6 +37627,84 @@ fi LIBS="$LIBS_orig" fi @@ -103,7 +103,7 @@ $NetBSD: patch-aa,v 1.34 2007/08/15 22:09:13 tnn Exp $ if test -z "$G_MODULE_IMPL"; then G_MODULE_IMPL=0 G_MODULE_SUPPORTED=false -@@ -37665,6 +37745,8 @@ fi +@@ -37661,6 +37741,8 @@ fi @@ -112,7 +112,7 @@ $NetBSD: patch-aa,v 1.34 2007/08/15 22:09:13 tnn Exp $ { echo "$as_me:$LINENO: checking for gspawn implementation" >&5 echo $ECHO_N "checking for gspawn implementation... $ECHO_C" >&6; } case "$host" in -@@ -38063,126 +38145,8 @@ if test x"$have_threads" != xno; then +@@ -38059,126 +38141,8 @@ if test x"$have_threads" != xno; then G_THREAD_LIBS="-lpthread -lthread" ;; *) @@ -241,7 +241,7 @@ $NetBSD: patch-aa,v 1.34 2007/08/15 22:09:13 tnn Exp $ ;; esac fi -@@ -40506,6 +40470,10 @@ case $host in +@@ -40503,6 +40467,10 @@ case $host in *) G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" ;; @@ -252,7 +252,7 @@ $NetBSD: patch-aa,v 1.34 2007/08/15 22:09:13 tnn Exp $ esac -@@ -46139,6 +46107,7 @@ G_MODULE_PLUGIN_LIBS!$G_MODULE_PLUGIN_LI +@@ -46199,6 +46167,7 @@ G_MODULE_PLUGIN_LIBS!$G_MODULE_PLUGIN_LI G_MODULE_LDFLAGS!$G_MODULE_LDFLAGS$ac_delim G_MODULE_HAVE_DLERROR!$G_MODULE_HAVE_DLERROR$ac_delim G_MODULE_BROKEN_RTLD_GLOBAL!$G_MODULE_BROKEN_RTLD_GLOBAL$ac_delim @@ -260,7 +260,7 @@ $NetBSD: patch-aa,v 1.34 2007/08/15 22:09:13 tnn Exp $ G_MODULE_NEED_USCORE!$G_MODULE_NEED_USCORE$ac_delim GLIB_DEBUG_FLAGS!$GLIB_DEBUG_FLAGS$ac_delim GSPAWN!$GSPAWN$ac_delim -@@ -46157,7 +46126,6 @@ ENABLE_REGEX_TRUE!$ENABLE_REGEX_TRUE$ac_ +@@ -46217,7 +46186,6 @@ ENABLE_REGEX_TRUE!$ENABLE_REGEX_TRUE$ac_ ENABLE_REGEX_FALSE!$ENABLE_REGEX_FALSE$ac_delim USE_SYSTEM_PCRE_TRUE!$USE_SYSTEM_PCRE_TRUE$ac_delim USE_SYSTEM_PCRE_FALSE!$USE_SYSTEM_PCRE_FALSE$ac_delim @@ -268,20 +268,20 @@ $NetBSD: patch-aa,v 1.34 2007/08/15 22:09:13 tnn Exp $ _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -46199,6 +46167,7 @@ _ACEOF +@@ -46259,6 +46227,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +PCRE_CFLAGS!$PCRE_CFLAGS$ac_delim PCRE_LIBS!$PCRE_LIBS$ac_delim + PCRE_REQUIRES!$PCRE_REQUIRES$ac_delim PCRE_WARN_CFLAGS!$PCRE_WARN_CFLAGS$ac_delim - G_LIBS_EXTRA!$G_LIBS_EXTRA$ac_delim -@@ -46219,7 +46188,7 @@ LIBOBJS!$LIBOBJS$ac_delim +@@ -46281,7 +46250,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |