diff options
Diffstat (limited to 'devel/glib20/files/patch-ae')
| -rw-r--r-- | devel/glib20/files/patch-ae | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index 29a7e4c9617f..e05693d07459 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -1,9 +1,9 @@ $FreeBSD$ ---- configure.orig Fri May 4 19:11:43 2001 -+++ configure Mon May 14 13:13:57 2001 -@@ -6339,6 +6339,12 @@ +--- configure.orig Wed Jun 13 19:39:30 2001 ++++ configure Wed Aug 1 19:33:18 2001 +@@ -10018,6 +10018,12 @@ linux*) G_MODULE_LDFLAGS='-rdynamic' ;; @@ -16,42 +16,50 @@ $FreeBSD$ esac LIBS_orig="$LIBS" LDFLAGS_orig="$LDFLAGS" -@@ -6805,7 +6811,7 @@ +@@ -10488,8 +10494,8 @@ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads" fi ;; - *-freebsd2.2*) +- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE" + *-freebsd*) - G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE" ++ G_THREAD_CFLAGS="$G_THREAD_CFLAGS $PTHREAD_CFLAGS" # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support -@@ -6891,8 +6897,8 @@ + # -mthreads flag. +@@ -10569,13 +10575,13 @@ + fi + ;; + *) +- for thread_lib in "" pthread pthread32 pthreads c_r thread dce; do ++ for thread_lib in "$PTHREAD_LIBS" "" pthread pthread32 pthreads c_r thread dce; do + if test x"$thread_lib" = x; then add_thread_lib="" IN="" else - add_thread_lib="-l$thread_lib" - IN=" in -l$thread_lib" -+ add_thread_lib="-$thread_lib" -+ IN=" in -$thread_lib" ++ add_thread_lib="$thread_lib" ++ IN=" in $thread_lib" fi if test x"$have_threads" = xposix; then defattr=0 -@@ -7431,6 +7437,7 @@ +@@ -11114,6 +11120,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else +# LIBS="-lgiconv $LIBS" cat > conftest.$ac_ext <<EOF - #line 7436 "configure" + #line 11119 "configure" #include "confdefs.h" -@@ -7798,14 +7805,14 @@ +@@ -11481,14 +11488,14 @@ # # Check for libiconv # - echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6 --echo "configure:7803: checking for libiconv_open in -liconv" >&5 +-echo "configure:11486: checking for libiconv_open in -liconv" >&5 + echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6 -+echo "configure:7803: checking for libiconv_open in -lgiconv" >&5 ++echo "configure:11486: checking for libiconv_open in -lgiconv" >&5 ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -60,9 +68,9 @@ $FreeBSD$ -LIBS="-liconv $LIBS" +LIBS="-lgiconv $LIBS" cat > conftest.$ac_ext <<EOF - #line 7811 "configure" + #line 11494 "configure" #include "confdefs.h" -@@ -7845,7 +7852,7 @@ +@@ -11528,7 +11535,7 @@ fi if test "x$with_libiconv" = "xyes" ; then |