aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorlev <lev@FreeBSD.org>2006-12-05 19:32:32 +0800
committerlev <lev@FreeBSD.org>2006-12-05 19:32:32 +0800
commit51690a14fc94fd408b8fd8420a825cd0e04c897a (patch)
tree7c240bec6ba0dc0d4829a119d85144fd9adab60d /devel
parent2c6bd040749472d42d65a3387bc521590eba2ed4 (diff)
downloadfreebsd-ports-gnome-51690a14fc94fd408b8fd8420a825cd0e04c897a.tar.gz
freebsd-ports-gnome-51690a14fc94fd408b8fd8420a825cd0e04c897a.tar.zst
freebsd-ports-gnome-51690a14fc94fd408b8fd8420a825cd0e04c897a.zip
Add optional iconv support to gcc.
PR: ports/87120 Submitted by: MOROHOSHI Akihiko <moro@remus.dti.ne.jpg>
Diffstat (limited to 'devel')
-rw-r--r--devel/mingw32-gcc/Makefile11
-rw-r--r--devel/mingw32-gcc/files/patch-gcc-configure11
2 files changed, 22 insertions, 0 deletions
diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile
index 4aec9259ce1c..cc23fc10798e 100644
--- a/devel/mingw32-gcc/Makefile
+++ b/devel/mingw32-gcc/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gcc
PORTVERSION= ${GCCVERSION}.${PATCHVERSION}
PORTEPOCH= 1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
#MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
@@ -53,6 +54,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${GCCVERSION}-${PATCHVERSION:S/./-/g}
USE_PERL5_BUILD=yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
+USE_ICONV= yes
CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \
--enable-languages=c,c++,f77,objc,java \
--with-gcc --with-gnu-ld --with-gnu-as \
@@ -83,6 +85,15 @@ INFO_PATH= ${PKGNAMEPREFIX:S/-$//}/info
BINARIES= gcc cpp g++ g77 gcov gcj gcjh jcf-dump jv-scan grepjar jar
+.if exists(${LOCALBASE}/lib/libiconv.so.3)
+WITH_LIBICONV= yes
+.endif
+
+.if defined(WITH_LIBICONV)
+USE_ICONV= yes
+CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE}
+.endif
+
.include <bsd.port.pre.mk>
.if ${ARCH} == "alpha"
diff --git a/devel/mingw32-gcc/files/patch-gcc-configure b/devel/mingw32-gcc/files/patch-gcc-configure
new file mode 100644
index 000000000000..1ac260817eb1
--- /dev/null
+++ b/devel/mingw32-gcc/files/patch-gcc-configure
@@ -0,0 +1,11 @@
+--- gcc/configure.orig Tue Dec 5 12:37:14 2006
++++ gcc/configure Tue Dec 5 12:37:50 2006
+@@ -7993,7 +7993,7 @@
+ conftest$ac_exeext conftest.$ac_ext
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+- LIBS="$LIBS $am_cv_libiconv_ldpath -liconv"
++ LIBS="$LIBS $am_cv_lib_iconv_ldpath -liconv"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF