diff options
Diffstat (limited to 'devel/glib20/files/patch-ae')
| -rw-r--r-- | devel/glib20/files/patch-ae | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index ac0d23c867e0..29a7e4c9617f 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -1,9 +1,9 @@ $FreeBSD$ ---- configure.orig Mon Apr 16 19:12:05 2001 -+++ configure Sun Apr 29 14:01:19 2001 -@@ -6287,6 +6287,12 @@ +--- configure.orig Fri May 4 19:11:43 2001 ++++ configure Mon May 14 13:13:57 2001 +@@ -6339,6 +6339,12 @@ linux*) G_MODULE_LDFLAGS='-rdynamic' ;; @@ -16,7 +16,7 @@ $FreeBSD$ esac LIBS_orig="$LIBS" LDFLAGS_orig="$LDFLAGS" -@@ -6753,7 +6759,7 @@ +@@ -6805,7 +6811,7 @@ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads" fi ;; @@ -25,7 +25,7 @@ $FreeBSD$ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE" # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support -@@ -6840,8 +6846,8 @@ +@@ -6891,8 +6897,8 @@ add_thread_lib="" IN="" else @@ -36,31 +36,22 @@ $FreeBSD$ fi if test x"$have_threads" = xposix; then defattr=0 -@@ -7142,7 +7148,7 @@ - sizeof (buffer)); - ; return 0; } - EOF --if { (eval echo configure:7146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then - rm -rf conftest* - ac_cv_func_nonposix_getpwuid_r=yes - else -@@ -7440,6 +7446,7 @@ +@@ -7431,6 +7437,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else -+# LIBS="-liconv $LIBS" ++# LIBS="-lgiconv $LIBS" cat > conftest.$ac_ext <<EOF - #line 7445 "configure" + #line 7436 "configure" #include "confdefs.h" -@@ -7747,14 +7754,14 @@ +@@ -7798,14 +7805,14 @@ # # Check for libiconv # - echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6 --echo "configure:7752: checking for libiconv_open in -liconv" >&5 +-echo "configure:7803: checking for libiconv_open in -liconv" >&5 + echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6 -+echo "configure:7752: checking for libiconv_open in -lgiconv" >&5 ++echo "configure:7803: 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 @@ -69,9 +60,9 @@ $FreeBSD$ -LIBS="-liconv $LIBS" +LIBS="-lgiconv $LIBS" cat > conftest.$ac_ext <<EOF - #line 7760 "configure" + #line 7811 "configure" #include "confdefs.h" -@@ -7794,7 +7801,7 @@ +@@ -7845,7 +7852,7 @@ fi if test "x$with_libiconv" = "xyes" ; then |