Date: Mon, 18 Mar 2002 18:01:39 -0500 (EST) From: Joe Marcus Clarke <marcus@marcuscom.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/36063: [PATCH] Remove giconv stuff from nautilus Message-ID: <200203182301.g2IN1d073009@gyros.marcuscom.com>
next in thread | raw e-mail | index | archive | help
>Number: 36063
>Category: ports
>Synopsis: [PATCH] Remove giconv stuff from nautilus
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 18 15:10:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Joe Marcus Clarke
>Release: FreeBSD 4.5-STABLE i386
>Organization:
MarcusCom, Inc.
>Environment:
System: FreeBSD gyros.marcuscom.com 4.5-STABLE FreeBSD 4.5-STABLE #0: Thu Mar 14 01:33:12 EST 2002 marcus@gyros.marcuscom.com:/usr/obj/usr/src/sys/GYROS i386
>Description:
Remove all the -lgiconv stuff from Nautilus. Note, another patch is coming
that removes the nl_langinfo hack for versions of -stable that now have
nl_langinfo(). This next patch will remove giconv for one more
location.
>How-To-Repeat:
>Fix:
--- nautilus.diff begins here ---
--- Makefile.orig Mon Mar 18 17:49:47 2002
+++ Makefile Mon Mar 18 17:49:40 2002
@@ -40,7 +40,7 @@
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \
- LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -lgiconv" \
+ LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \
LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" \
MSGFMT=${LOCALBASE}/bin/msgfmt-new \
XGETTEXT=${LOCALBASE}/bin/xgettext-new
--- files/patch-aa.orig Mon Mar 18 17:55:23 2002
+++ files/patch-aa Mon Mar 18 17:52:09 2002
@@ -30,33 +30,6 @@
cat > conftest.$ac_ext <<EOF
#line 7063 "configure"
#include "confdefs.h"
-@@ -7585,14 +7585,14 @@
- #
- # Check for libiconv
- #
-- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
--echo "configure:7590: checking for libiconv_open in -liconv" >&5
-+ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
-+echo "configure:7590: 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
- else
- ac_save_LIBS="$LIBS"
--LIBS="-liconv $LIBS"
-+LIBS="-lgiconv $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 7598 "configure"
- #include "confdefs.h"
-@@ -7632,7 +7632,7 @@
- fi
-
- if test "x$with_libiconv" = "xyes" ; then
-- ICONV_LIBS="-liconv"
-+ ICONV_LIBS="-lgiconv"
- fi
-
-
@@ -9141,7 +9141,7 @@
fi
--- nautilus.diff 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?200203182301.g2IN1d073009>