diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2006-03-15 22:42:16 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2006-03-15 22:42:16 +0000 |
| commit | 4f5c18a5105b253e407347c3b16e38863644a0e7 (patch) | |
| tree | cfd6d9c1dbd69e68d4dc211965b162ce967f7088 /lang/gcc/Makefile | |
| parent | Update to Wine 0.9.10. (diff) | |
Update to the 20060311 snapshot of GCC 4.2.0.
The spamming of $PREFIX/include/ssp is now finally gone after my reports
upstream, which allows us to restrict the conflict with gcc-4.1.* to the
case where we build Java.
Convert the build-time dependency on math/mpfr to a full one, since the
Fortran frontend also needs this at run time.
Always build both shared and static libraries instead of having these as
two exclusive options defaulting to the former.
Remove bogus USE_X11 (which was not used by default nor any other port).
No longer hardcode the version number in LATEST_LINK.
Notes
Notes:
svn path=/head/; revision=157354
Diffstat (limited to 'lang/gcc/Makefile')
| -rw-r--r-- | lang/gcc/Makefile | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 51231453b04e..e2e851286dbe 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.2.0 -PORTREVISION= 20060218 +PORTREVISION= 20060311 CATEGORIES= lang java VERSIONSTRING= 4.2-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -22,12 +22,12 @@ MAINTAINER= gerald@FreeBSD.org COMMENT= GNU Compiler Collection 4.2 .if defined(WITH_FORTRAN) -LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 -BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr +LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 \ + mpfr.1:${PORTSDIR}/math/mpfr .endif -CONFLICTS= gcc-4.1.* -LATEST_LINK?= gcc42${PKGNAMESUFFIX} +SUFFIX= 42 +LATEST_LINK?= gcc${SUFFIX}${PKGNAMESUFFIX} NOT_FOR_ARCHS= alpha USE_BISON= yes USE_BZIP2= yes @@ -36,7 +36,6 @@ USE_ICONV= yes USE_PERL5_BUILD=yes .if defined(WITH_JAVA_AWT) USE_GNOME= gtk20 -USE_X11= yes .endif PATCH_WRKSRC= ${SRCDIR} @@ -60,7 +59,6 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING} WRKSRC= ${WRKDIR}/build -SUFFIX= 42 TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION} GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-nls \ @@ -73,17 +71,11 @@ CONFIGURE_ARGS+= --disable-nls \ CONFIGURE_ENV= RANLIB=: .if defined(WITH_JAVA_AWT) CONFIGURE_ARGS+= --enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes -WANT_SHAREDLIBS=yes # We need this at the moment. .endif MAKE_ARGS+= MAKEINFOFLAGS="--no-split" -.if defined(WANT_SHAREDLIBS) -CONFIGURE_ARGS+= --enable-shared +ALL_TARGET= bootstrap INSTALLS_SHLIB= yes LDCONFIG_DIRS= ${TARGLIB} -.else -CONFIGURE_ARGS+= --disable-shared -.endif -ALL_TARGET= bootstrap PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \ SUFFIX=${SUFFIX} MAN1= cpp${SUFFIX}.1 \ @@ -107,6 +99,7 @@ PLIST_SUB+= FORTRAN="@comment " .endif .if ! defined(WITHOUT_JAVA) +CONFLICTS= gcc-4.1.* DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} EXTRA_PATCHES= ${FILESDIR}/java-patch-hier # FIXME: we are currently getting weird build failures with libjava on @@ -168,6 +161,8 @@ post-install: ${PREFIX}/man/man1/${f}${SUFFIX}.1; \ fi .endfor + ${MV} -f ${PREFIX}/include/mf-runtime.h \ + ${TARGLIB}/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/include ${RM} -f ${TARGLIB}/*.la ${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \ ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7 |