Date: Sun, 24 Mar 2002 17:17:18 -0500 (EST) From: Joe Marcus Clarke <marcus@marcuscom.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/36265: [PATCH] Remove giconv bits from devel/glib20 Message-ID: <200203242217.g2OMHIQ72317@shumai.marcuscom.com>
next in thread | raw e-mail | index | archive | help
>Number: 36265
>Category: ports
>Synopsis: [PATCH] Remove giconv bits from devel/glib20
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 24 14:20:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Joe Marcus Clarke
>Release: FreeBSD 4.5-STABLE i386
>Organization:
MarcusCom, Inc.
>Environment:
System: FreeBSD shumai.marcuscom.com 4.5-STABLE FreeBSD 4.5-STABLE #0: Sun Mar 24 16:40:24 EST 2002 marcus@shumai.marcuscom.com:/usr/obj/usr/src/sys/SHUMAI i386
>Description:
glib20 still has giconv references. Remove them, and let the normal iconv
stuff have its way.
>How-To-Repeat:
>Fix:
--- patch-ae.patch begins here ---
--- files/patch-ae.orig Sun Mar 24 17:09:23 2002
+++ files/patch-ae Sun Mar 24 17:11:54 2002
@@ -1,8 +1,5 @@
-
-$FreeBSD: ports/devel/glib20/files/patch-ae,v 1.22 2002/03/11 19:08:04 sobomax Exp $
-
---- configure.orig Fri Mar 8 17:54:21 2002
-+++ configure Mon Mar 11 10:21:32 2002
+--- configure.orig Sun Mar 24 17:10:35 2002
++++ configure Sun Mar 24 17:11:45 2002
@@ -16768,8 +16768,8 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
@@ -23,91 +20,3 @@
;;
*)
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
--- patch-ae.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203242217.g2OMHIQ72317>