aboutsummaryrefslogtreecommitdiff
path: root/lang/gcc42/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'lang/gcc42/Makefile')
-rw-r--r--lang/gcc42/Makefile33
1 files changed, 14 insertions, 19 deletions
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index a5be84c9fabb..8b409004c74f 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.0
-PORTREVISION= 20050508
+PORTREVISION= 20050515
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -30,7 +30,7 @@ COMMENT= GNU Compiler Collection 4.1
LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
.endif
-CONFLICTS= gcc-3.3.* gcc-4.0.*
+CONFLICTS= gcc-3.3.* gcc-3.4.* gcc-4.0.*
LATEST_LINK?= gcc41${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha
USE_BISON= yes
@@ -75,7 +75,7 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
CONFIGURE_ARGS+= --enable-shared
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB}
-EXTRA_SHLIB= libgcc_s
+EXTRA_LIBS= libgcc_s
.else
CONFIGURE_ARGS+= --disable-shared
.endif
@@ -98,13 +98,13 @@ MAN1= cpp${SUFFIX}.1 \
jcf-dump${SUFFIX}.1 \
jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-MAN7= fsf-funding.7 gfdl.7 gpl.7
INFO= cpp cppinternals gcc gccinstall gccint gcj fastjar
.if defined(WITHOUT_LIBJAVA)
CONFIGURE_ARGS+= --disable-libgcj
PLIST_SUB+= LIBJAVA="@comment "
.else
+EXTRA_LIBS+= libffi libgcj libgij
PLIST_SUB+= LIBJAVA=""
.endif
@@ -152,14 +152,13 @@ post-install: fake-manpages
.endfor
# These libraries are moved from PREFIX/lib to avoid conflicts with
# the stock compiler.
-.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_SHLIB}
+.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS}
${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB}
.endfor
- -${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
- ${RM} -f ${PREFIX}/lib/libiberty.a
- ${RM} -f ${TARGLIB}/*.la
- ${RM} -f ${PREFIX}/lib/lib-org-*.la
- # Handle target libraries, libexec binaries, and GCJ include files.
+ ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la
+ ${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
+ ${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/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
cd ${PREFIX} ; if [ -d $d ]; then \
@@ -168,15 +167,11 @@ post-install: fake-manpages
| ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
fi
.endfor
- (${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
- (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
- ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script
- ${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script
- ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script
- ${ECHO_CMD} "r ${WRKDIR}/PLIST.lib" >> ${WRKDIR}/ex.script
- ${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script
- ${CP} -p ${TMPPLIST} ${TMPPLIST}.pre
- cd ${WRKDIR} ; ex < ex.script
+ ${CAT} ${WRKDIR}/PLIST.lib >> ${TMPPLIST}
+ ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST}
+ ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${TMPPLIST}
+ ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST}
+ ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${TMPPLIST}
cklatest:
.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/