diff options
Diffstat (limited to 'lang/gcc42')
| -rw-r--r-- | lang/gcc42/Makefile | 24 | ||||
| -rw-r--r-- | lang/gcc42/distinfo | 12 | ||||
| -rw-r--r-- | lang/gcc42/pkg-plist | 22 |
3 files changed, 36 insertions, 22 deletions
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile index 4a1ccccbf787..d66f453c56cb 100644 --- a/lang/gcc42/Makefile +++ b/lang/gcc42/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -SNAPDATE= 2003-11-26 +SNAPDATE= 2003-12-10 #CVS_DATE= ${SNAPDATE} 18:53:04 EDT PORTNAME= gcc @@ -41,14 +41,12 @@ NOMANCOMPRESS= yes # too hard to deal with differences on 5-cur and releng4 .include <bsd.port.pre.mk> -BROKEN= "Building libjava causes an Internal Compiler Error iff built within the ports tree" - CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} GCC_VER= ${PORTVERSION:C/\.0$//} SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING} WRKSRC= ${WRKDIR}/build -TARGLIB= ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_VER} +TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${GCC_VER} PLIST_SUB= GCC_VER=${GCC_VER} GNU_HOST=${CONFIGURE_TARGET} GNU_CONFIGURE= yes USE_GMAKE= yes @@ -57,7 +55,7 @@ CONFIGURE_ARGS= --disable-nls \ --with-gxx-include-dir=${TARGLIB}/include/c++/${GCC_REV} #CONFIGURE_ARGS+= --program-suffix=34 # Java -CONFIGURE_ARGS+= --with-system-zlib #--includedir=${TARGLIB}/include/Java -libdir=${TARGLIB} +CONFIGURE_ARGS+= --with-system-zlib MAKE_ARGS+= MAKEINFOFLAGS="--no-split" .if defined(WANT_SHAREDLIBS) CONFIGURE_ARGS+= --enable-shared @@ -78,7 +76,7 @@ MAN1= cpp34.1 g++34.1 g77-34.1 gcc34.1 gcov34.1 \ jcf-dump34.1 jv-scan34.1 jv-convert34.1 \ rmic34.1 rmiregistry34.1 MAN7= fsf-funding.7 gfdl.7 gpl.7 -INFO= cpp cppinternals g77 gcc gccint gcj +INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar .if defined(CVS_DATE) NO_CHECKSUM= yes @@ -151,7 +149,7 @@ post-install: -${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB} ${RM} -f ${PREFIX}/lib/libiberty.a ${RM} -f ${TARGLIB}/*.la -.for info in cpp cppinternals g77 gcc gccint gcj +.for info in ${INFO} install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir .endfor # I am sick and tired of the anonyance that man pages can only be generated if @@ -161,11 +159,11 @@ post-install: .endfor cd ${PREFIX} ;\ ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l \ - >${WRKDIR}/PLIST.gcc-lib + >${WRKDIR}/PLIST.lib cd ${PREFIX} ;\ ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib - (${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.gcc-lib + | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib + (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib # Handle GCJ include files. ${RM} -f ${WRKDIR}/PLIST.gcj-inc .for inc in ${PREFIX}/include/gcj ${PREFIX}/include/gnu ${PREFIX}/include/java ${PREFIX}/include/javax @@ -176,14 +174,14 @@ post-install: | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcj-inc .endfor ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script - ${ECHO_CMD} "/Insert PLIST.gcc-lib" >> ${WRKDIR}/ex.script + ${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib" >> ${WRKDIR}/ex.script + ${ECHO_CMD} "r ${WRKDIR}/PLIST.lib" >> ${WRKDIR}/ex.script ${ECHO_CMD} "/Insert PLIST.gcj-inc" >> ${WRKDIR}/ex.script ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script ${ECHO_CMD} "r ${WRKDIR}/PLIST.gcj-inc" >> ${WRKDIR}/ex.script ${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script - ${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib + ${CP} -p ${TMPPLIST} ${TMPPLIST}.pre cd ${WRKDIR} ; ex < ex.script cklatest: diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo index bd13e0869173..8853ef3a4083 100644 --- a/lang/gcc42/distinfo +++ b/lang/gcc42/distinfo @@ -1,6 +1,6 @@ -MD5 (gcc-core-3.4-20031126.tar.bz2) = 1e7312be9f96a68234d734a49a5356f5 -MD5 (gcc-g++-3.4-20031126.tar.bz2) = e942f2fafcdd26fcf57e888dcc0287b2 -MD5 (gcc-g77-3.4-20031126.tar.bz2) = 407374ee87713d547d684d72cb8e0ed9 -MD5 (gcc-java-3.4-20031126.tar.bz2) = 1c2a018d4577fffdf74350d5520166a6 -MD5 (gcc-objc-3.4-20031126.tar.bz2) = 9ba8f817c30bf92d3f22c46eba19c329 -MD5 (gcc-testsuite-3.4-20031126.tar.bz2) = d615c0729e1f166aa1a0c858ada3d8f7 +MD5 (gcc-core-3.4-20031210.tar.bz2) = 03c1c996a57b8ab91ceecf2e6f695fe9 +MD5 (gcc-g++-3.4-20031210.tar.bz2) = 3e43d8cea953afcb1b22e8d89f2fec6a +MD5 (gcc-g77-3.4-20031210.tar.bz2) = f77fe5c37b0dedeb4a2384a6364972b4 +MD5 (gcc-java-3.4-20031210.tar.bz2) = 2aaaba00c80f15140c2e36d447209f54 +MD5 (gcc-objc-3.4-20031210.tar.bz2) = f1e2e33c8ee00d76b1b086b235f64e3c +MD5 (gcc-testsuite-3.4-20031210.tar.bz2) = af3a37a463b35676d8974c0f285f6dda diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist index 7544216cd144..182357f13a85 100644 --- a/lang/gcc42/pkg-plist +++ b/lang/gcc42/pkg-plist @@ -8,6 +8,7 @@ bin/%%GNU_HOST%%-gcc-%%GCC_VER%% bin/%%GNU_HOST%%-gcc34 bin/%%GNU_HOST%%-g++34 bin/%%GNU_HOST%%-gcj +bin/%%GNU_HOST%%-gcjh bin/gccbug-%%GCC_VER%% bin/gcj34 bin/gcjh34 @@ -25,6 +26,9 @@ include/jni.h include/jvmpi.h lib/libffi.la lib/libffi.a +lib/logging.properties +lib/pkgconfig/libgcj.pc +@dirrm lib/pkgconfig lib/security/classpath.security lib/security/libgcj.security @dirrm lib/security @@ -32,10 +36,22 @@ lib/lib-org-xml-sax.la lib/lib-org-xml-sax.a lib/lib-org-w3c-dom.la lib/lib-org-w3c-dom.a +libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1 +libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus +libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/f771 +libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jc1 +libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jvgenmain +libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1obj +libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/collect2 +libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixinc.sh +libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl +libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders +@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools +@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%% share/java/libgcj-%%GCC_VER%%.jar -@comment Insert PLIST.gcc-lib here -@comment -=[ begin PLIST.gcc-lib ]=- -@comment -=[ end PLIST.gcc-lib ]=- +@comment Insert PLIST.lib here +@comment -=[ begin PLIST.lib ]=- +@comment -=[ end PLIST.lib ]=- @comment Insert PLIST.gcj-inc here @comment -=[ begin PLIST.gcj-inc ]=- @comment -=[ end PLIST.gcj-inc ]=- |