diff options
author | sobomax <sobomax@FreeBSD.org> | 2002-03-28 20:29:54 +0800 |
---|---|---|
committer | sobomax <sobomax@FreeBSD.org> | 2002-03-28 20:29:54 +0800 |
commit | f28e7036c32954bbd2479366f111938909e031e5 (patch) | |
tree | 9fcaec287204c4b77608fde0aa0abdc35cbe7d92 | |
parent | 68cc47ea468ff4801f77ddfd7311e85962b07269 (diff) | |
download | freebsd-ports-gnome-f28e7036c32954bbd2479366f111938909e031e5.tar.gz freebsd-ports-gnome-f28e7036c32954bbd2479366f111938909e031e5.tar.zst freebsd-ports-gnome-f28e7036c32954bbd2479366f111938909e031e5.zip |
Remove iconv->giconv hack.
PR: 36265
Submitted by: Joe Marcus Clarke <marcus@marcuscom.com>
-rw-r--r-- | devel/glib20/files/patch-ae | 88 |
1 files changed, 0 insertions, 88 deletions
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index 9e3176622e51..e9e7eacafee5 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -23,91 +23,3 @@ $FreeBSD$ ;; *) for thread_lib in "" pthread pthread32 pthreads thread dce; do -@@ -18048,13 +18048,13 @@ - - # Check if we have GNU libiconv - if test $found_iconv = "no"; then -- echo "$as_me:18051: checking for libiconv_open in -liconv" >&5 --echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6 -+ echo "$as_me:18051: checking for libiconv_open in -lgiconv" >&5 -+echo $ECHO_N "checking for libiconv_open in -lgiconv... $ECHO_C" >&6 - if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-liconv $LIBS" -+LIBS="-lgiconv $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line 18059 "configure" - #include "confdefs.h" -@@ -18108,15 +18108,15 @@ - fi - - fi -- # Check if we have a iconv in -liconv, possibly from vendor -+ # Check if we have a iconv in -lgiconv, possibly from vendor - if test $found_iconv = "no"; then -- echo "$as_me:18113: checking for iconv_open in -liconv" >&5 --echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6 -+ echo "$as_me:18113: checking for iconv_open in -lgiconv" >&5 -+echo $ECHO_N "checking for iconv_open in -lgiconv... $ECHO_C" >&6 - if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-liconv $LIBS" -+LIBS="-lgiconv $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line 18121 "configure" - #include "confdefs.h" -@@ -18242,13 +18242,13 @@ - - ;; - gnu|yes) -- echo "$as_me:18245: checking for libiconv_open in -liconv" >&5 --echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6 -+ echo "$as_me:18245: checking for libiconv_open in -lgiconv" >&5 -+echo $ECHO_N "checking for libiconv_open in -lgiconv... $ECHO_C" >&6 - if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-liconv $LIBS" -+LIBS="-lgiconv $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line 18253 "configure" - #include "confdefs.h" -@@ -18303,13 +18303,13 @@ - - ;; - native) -- echo "$as_me:18306: checking for iconv_open in -liconv" >&5 --echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6 -+ echo "$as_me:18306: checking for iconv_open in -lgiconv" >&5 -+echo $ECHO_N "checking for iconv_open in -lgiconv... $ECHO_C" >&6 - if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-liconv $LIBS" -+LIBS="-lgiconv $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line 18314 "configure" - #include "confdefs.h" -@@ -18373,14 +18373,14 @@ - - case $with_libiconv in - gnu) -- ICONV_LIBS="-liconv" -+ ICONV_LIBS="-lgiconv" - cat >>confdefs.h <<\_ACEOF - #define USE_LIBICONV_GNU Using GNU libiconv - _ACEOF - - ;; - native) -- ICONV_LIBS="-liconv" -+ ICONV_LIBS="-lgiconv" - cat >>confdefs.h <<\_ACEOF - #define USE_LIBICONV_NATIVE Using a native implementation of iconv in a separate library - _ACEOF |