diff options
Diffstat (limited to 'devel')
-rw-r--r-- | devel/mingw32-gcc/Makefile | 11 | ||||
-rw-r--r-- | devel/mingw32-gcc/files/patch-gcc-configure | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile index 4aec925..cc23fc1 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 0000000..1ac2608 --- /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 |