diff options
Diffstat (limited to 'devel/glib2/patches/patch-aa')
| -rw-r--r-- | devel/glib2/patches/patch-aa | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa index 24ad6dbeee5..bcd713cff51 100644 --- a/devel/glib2/patches/patch-aa +++ b/devel/glib2/patches/patch-aa @@ -1,4 +1,11 @@ -$NetBSD: patch-aa,v 1.57 2014/09/05 20:49:55 prlw1 Exp $ +$NetBSD: patch-aa,v 1.58 2014/10/07 23:18:36 prlw1 Exp $ + +- solaris sun studio check and fix +- use pkgsrc libtool +- broken dlopen(NULL,0) detection and workaround + http://bugzilla.gnome.org/show_bug.cgi?id=140329 +- remove unnecessary executions of libtool from configure + https://bugzilla.gnome.org/show_bug.cgi?id=736710 --- configure.orig 2013-10-15 19:14:48.000000000 +0000 +++ configure @@ -85,7 +92,7 @@ $NetBSD: patch-aa,v 1.57 2014/09/05 20:49:55 prlw1 Exp $ else export SED - G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+ G_MODULE_LDFLAGS=`(libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++ eval G_MODULE_LDFLAGS=$export_dynamic_flag_spec fi G_MODULE_NEED_USCORE=0 G_MODULE_BROKEN_RTLD_GLOBAL=0 @@ -93,7 +100,7 @@ $NetBSD: patch-aa,v 1.57 2014/09/05 20:49:55 prlw1 Exp $ G_MODULE_HAVE_DLERROR=0 if test -z "$G_MODULE_IMPL"; then case "$host" in -@@ -25271,13 +25307,13 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IM +@@ -25271,13 +25307,12 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IM LIBS="$G_MODULE_LIBS $LIBS" LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" echo "void glib_plugin_test(void) { }" > plugin.c @@ -106,7 +113,6 @@ $NetBSD: patch-aa,v 1.57 2014/09/05 20:49:55 prlw1 Exp $ -shrext ".o" -avoid-version plugin.lo \ -rpath /dont/care >/dev/null 2>&1 - eval `./libtool --config | grep ^objdir` -+ eval `libtool --config | grep ^objdir` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTLD_GLOBAL brokenness" >&5 $as_echo_n "checking for RTLD_GLOBAL brokenness... " >&6; } if ${glib_cv_rtldglobal_broken+:} false; then : @@ -167,13 +173,12 @@ $NetBSD: patch-aa,v 1.57 2014/09/05 20:49:55 prlw1 Exp $ if test -z "$G_MODULE_IMPL"; then G_MODULE_IMPL=0 G_MODULE_SUPPORTED=false -@@ -25397,7 +25483,7 @@ fi +@@ -25397,7 +25483,5 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the suffix of module shared libraries" >&5 $as_echo_n "checking for the suffix of module shared libraries... " >&6; } export SED -shrext_cmds=`./libtool --config | grep '^shrext_cmds='` -+shrext_cmds=`libtool --config | grep '^shrext_cmds='` - eval $shrext_cmds +-eval $shrext_cmds module=yes eval std_shrext=$shrext_cmds # chop the initial dot @@ -25421,6 +25507,7 @@ fi @@ -249,11 +254,3 @@ $NetBSD: patch-aa,v 1.57 2014/09/05 20:49:55 prlw1 Exp $ ;; esac -@@ -27053,6 +27086,7 @@ case $host in - ;; - *-*-openbsd*) - LDFLAGS="$LDFLAGS -pthread" -+ G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" - ;; - *) - G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" |