aboutsummaryrefslogtreecommitdiff
path: root/lang/gcc46/Makefile
diff options
context:
space:
mode:
authorGerald Pfeifer <gerald@FreeBSD.org>2009-05-18 10:01:29 +0000
committerGerald Pfeifer <gerald@FreeBSD.org>2009-05-18 10:01:29 +0000
commit7ccb59fb24f6328f8e45fee36a29d9f4fa077561 (patch)
tree2a8aa3915a1354b62b6572e8ccf31ea8c707c819 /lang/gcc46/Makefile
parenteedf4d3f676b9263887341d86525d70cf3eed418 (diff)
downloadports-7ccb59fb24f6328f8e45fee36a29d9f4fa077561.tar.gz
ports-7ccb59fb24f6328f8e45fee36a29d9f4fa077561.zip
Notes
Diffstat (limited to 'lang/gcc46/Makefile')
-rw-r--r--lang/gcc46/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index c5a868ea3378..d1cb6af845f4 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.5.0
-PORTREVISION= 20090507
+PORTREVISION= 20090514
CATEGORIES= lang java
VERSIONSTRING= 4.5-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -29,7 +29,7 @@ DISTFILES+= gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu
.endif
-SUFFIX= 45
+SUFFIX= ${PORTVERSION:C/([0-9]).([0-9]).*/\1\2/}
LATEST_LINK= gcc${SUFFIX}${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha ia64 powerpc
USE_BISON= build
@@ -57,7 +57,8 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
-TARGLIB= ${PREFIX}/lib/gcc-${PORTVERSION}
+TARGLIB= ${PREFIX}/lib/gcc${SUFFIX}
+LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX}
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-nls \
--with-system-zlib \
@@ -65,6 +66,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-gmp=${LOCALBASE} \
--program-suffix=${SUFFIX} \
--libdir=${TARGLIB} \
+ --libexecdir=${LIBEXEC} \
--with-gxx-include-dir=${TARGLIB}/include/c++/
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
ALL_TARGET= bootstrap-lean
@@ -167,15 +169,13 @@ post-install:
${RM} -f ${TARGLIB}/*.la
# Add target libraries and include files to packaging list.
${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} libexec/gcc/${CONFIGURE_TARGET}/${PORTVERSION} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
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/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}
.include <bsd.port.post.mk>