1 files changed, 10 insertions, 61 deletions
diff --git a/devel/glib20/files/patch-configure b/devel/glib20/files/patch-configure
index 9396ef32ab24..9a57c07a7a2c 100644
--- a/devel/glib20/files/patch-configure
+++ b/devel/glib20/files/patch-configure
@@ -1,67 +1,16 @@
---- configure.orig	2013-08-29 23:29:13.255661322 +0200
-+++ configure	2013-08-29 23:48:08.845647995 +0200
-@@ -603,6 +603,9 @@
- #ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
-+#ifdef HAVE_SYS_PARAM_H
-+# include <sys/param.h>
-+#endif
- #ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
-@@ -5778,7 +5781,7 @@
- fi
- 
- GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
--ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`"
-+ABS_GLIB_RUNTIME_LIBDIR="`readlink $libdir/$with_runtime_libdir`"
- 
- 
-  if test "x$with_runtime_libdir" != "x"; then
-@@ -7444,13 +7447,12 @@
- 
-       ;;
-     native)
--      { $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.  */
- 
-@@ -8648,6 +8650,7 @@
+--- configure.orig	2014-09-28 09:31:41.079343419 +0200
++++ configure	2014-09-28 09:31:41.243342071 +0200
+@@ -26730,9 +26728,12 @@
+   *android*)
+     G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
      ;;
-   native)
- 
-+ICONV_LIBS=""
- $as_echo "#define USE_LIBICONV_NATIVE 1" >>confdefs.h
- 
-     ;;
-@@ -23201,7 +23204,7 @@
- fi
- done
- 
--for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid
-+for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid sysctlbyname
- do :
-   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-@@ -26741,10 +26744,10 @@
- #  b) FreeBSD doesn't do this either.
- #
- case $host in
 -  *-*-freebsd*|*-*-linux*)
 +  *-*-linux*)
      G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`"
      ;;
--  *-*-openbsd*)
-+  *-*-openbsd*|*-*-freebsd*)
-     LDFLAGS="$LDFLAGS -pthread"
-     ;;
++  *-*-freebsd*)
++    LDFLAGS="$LDFLAGS -pthread"
++    ;;    
    *)
+     G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
+     ;;