diff options
Diffstat (limited to 'devel/glib20/files/patch-configure')
| -rw-r--r-- | devel/glib20/files/patch-configure | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/devel/glib20/files/patch-configure b/devel/glib20/files/patch-configure index 331a77152..96ba9d202 100644 --- a/devel/glib20/files/patch-configure +++ b/devel/glib20/files/patch-configure @@ -1,6 +1,22 @@ ---- configure.orig 2013-09-26 18:07:07.000000000 +0200 -+++ configure 2013-09-26 18:08:15.000000000 +0200 -@@ -7643,13 +7646,12 @@ +--- configure.orig 2014-09-28 09:31:41.079343419 +0200 ++++ configure 2014-09-28 09:31:41.243342071 +0200 +@@ -7534,13 +7534,12 @@ + fi + # Check if we have a iconv in -liconv, possibly from vendor + if test $found_iconv = "no"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -liconv" >&5 +-$as_echo_n "checking for iconv_open in -liconv... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open" >&5 ++$as_echo_n "checking for iconv_open... " >&6; } + if ${ac_cv_lib_iconv_iconv_open+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-liconv $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -7626,13 +7625,12 @@ ;; native) @@ -16,15 +32,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -8684,6 +8686,7 @@ - ;; - native) - -+ICONV_LIBS="" - $as_echo "#define USE_LIBICONV_NATIVE 1" >>confdefs.h - - ;; -@@ -27013,10 +27016,10 @@ +@@ -26730,9 +26728,12 @@ *android*) G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" ;; @@ -32,8 +40,9 @@ + *-*-linux*) G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`" ;; -- *-*-openbsd*) -+ *-*-freebsd*|*-*-openbsd*) - LDFLAGS="$LDFLAGS -pthread" - ;; ++ *-*-freebsd*) ++ LDFLAGS="$LDFLAGS -pthread" ++ ;; *) + G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" + ;; |