diff options
| author | gerald <gerald@FreeBSD.org> | 2006-07-09 04:09:56 +0800 |
|---|---|---|
| committer | gerald <gerald@FreeBSD.org> | 2006-07-09 04:09:56 +0800 |
| commit | e19d41491a8f5ddbfa32b9079729ca0d1dc0e85e (patch) | |
| tree | 569bc69faf717c549429a4b448cbccfaf5564793 | |
| parent | 6bdd9d8d1dac0fb64c47552ed5308fafa00a3895 (diff) | |
| download | freebsd-ports-gnome-e19d41491a8f5ddbfa32b9079729ca0d1dc0e85e.tar.gz freebsd-ports-gnome-e19d41491a8f5ddbfa32b9079729ca0d1dc0e85e.tar.zst freebsd-ports-gnome-e19d41491a8f5ddbfa32b9079729ca0d1dc0e85e.zip | |
Update to the 20060706 snapshot of GCC 4.0.4.
Simplify the subdirectory we use for GCC-specific libraries and include
files from gcc/${CONFIGURE_TARGET}/${PORTVERSION} to gcc-${PORTVERSION}.
Remove the hack to set RANLIB=: now that this has been addressed upstream.
| -rw-r--r-- | lang/gcc40/Makefile | 9 | ||||
| -rw-r--r-- | lang/gcc40/distinfo | 24 |
2 files changed, 15 insertions, 18 deletions
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile index c606ca9e3153..9c29538a3fbf 100644 --- a/lang/gcc40/Makefile +++ b/lang/gcc40/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.0.4 -PORTREVISION= 20060629 +PORTREVISION= 20060706 CATEGORIES= lang VERSIONSTRING= 4.0-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -43,7 +43,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING} WRKSRC= ${WRKDIR}/build -TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION} +TARGLIB= ${PREFIX}/lib/gcc-${PORTVERSION} GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-nls \ --with-system-zlib \ @@ -52,7 +52,6 @@ CONFIGURE_ARGS+= --disable-nls \ --libdir=${TARGLIB} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ \ --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX} -CONFIGURE_ENV= RANLIB=: MAKE_ARGS+= MAKEINFOFLAGS="--no-split" ALL_TARGET= bootstrap-lean USE_LDCONFIG= ${TARGLIB} @@ -109,15 +108,13 @@ post-install: ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7 # Add target libraries and include files to packaging list. ${RM} -f ${WRKDIR}/PLIST.lib -.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/^${PREFIX}\///:S/lib/libexec/} +.for d in ${TARGLIB:S/^${PREFIX}\///} libexec/gcc/${CONFIGURE_TARGET}/${PORTVERSION} cd ${PREFIX} ; if [ -d $d ]; then \ ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\ ${FIND} $d -type d | ${SORT} -r \ | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\ fi .endfor - ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib - ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST} diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo index 84bd2ca12bbc..e14cda52820c 100644 --- a/lang/gcc40/distinfo +++ b/lang/gcc40/distinfo @@ -1,12 +1,12 @@ -MD5 (gcc-core-4.0-20060629.tar.bz2) = 564e41333f135048b5515badc1d48ba7 -SHA256 (gcc-core-4.0-20060629.tar.bz2) = aa05a804e90be1ae462a1ee967113cc9b1012625c7e8344ff6783c743ca6201b -SIZE (gcc-core-4.0-20060629.tar.bz2) = 13774531 -MD5 (gcc-g++-4.0-20060629.tar.bz2) = cdc734c8cf2c5df70492fe85d1def007 -SHA256 (gcc-g++-4.0-20060629.tar.bz2) = 71396b6da7d339754289883596c52c4c61d5fb783ceb83b65dcec57b08a7444a -SIZE (gcc-g++-4.0-20060629.tar.bz2) = 2716952 -MD5 (gcc-objc-4.0-20060629.tar.bz2) = bd7d02292d38077bf118cafa9a68c4f2 -SHA256 (gcc-objc-4.0-20060629.tar.bz2) = f63427174abde35bce6928489e549f448f0f88ce632af2397ea97d2e357697f8 -SIZE (gcc-objc-4.0-20060629.tar.bz2) = 180170 -MD5 (gcc-testsuite-4.0-20060629.tar.bz2) = 7c7627e4de8a02064fe3aca18646dd0b -SHA256 (gcc-testsuite-4.0-20060629.tar.bz2) = 54fc10bb2e5d7c722ced6e76a77cb4c4f78a476b666625a72e19b181eed6ebe3 -SIZE (gcc-testsuite-4.0-20060629.tar.bz2) = 3257925 +MD5 (gcc-core-4.0-20060706.tar.bz2) = 10f718ae6cfb68793d23288534ddc4fe +SHA256 (gcc-core-4.0-20060706.tar.bz2) = 65cb2b0484c4daa3aa1269b61c655da39894422a6bdb7a870269df01c9fef39a +SIZE (gcc-core-4.0-20060706.tar.bz2) = 13775157 +MD5 (gcc-g++-4.0-20060706.tar.bz2) = 410d8d61e84fff705e66a794a9d2e406 +SHA256 (gcc-g++-4.0-20060706.tar.bz2) = f3ac3d8d8d3915527cfc7582c167276bff4ba04568273a9f00ec65ec91eabdce +SIZE (gcc-g++-4.0-20060706.tar.bz2) = 2716871 +MD5 (gcc-objc-4.0-20060706.tar.bz2) = 5b7a7f7008cf073328bf3e081cd7ff23 +SHA256 (gcc-objc-4.0-20060706.tar.bz2) = 818e3db3f385762f0bc9ef1572465fc0c59ef5ce3107ee0055bedad8ad5759cb +SIZE (gcc-objc-4.0-20060706.tar.bz2) = 180197 +MD5 (gcc-testsuite-4.0-20060706.tar.bz2) = 443dddcefc2805e610cc5a067447fa9f +SHA256 (gcc-testsuite-4.0-20060706.tar.bz2) = 51a3a3fb2152e4149818c6725bb43ebfdd2e22367458530d9b0a796ee87ba353 +SIZE (gcc-testsuite-4.0-20060706.tar.bz2) = 3261467 |