summaryrefslogtreecommitdiff
path: root/lang/gcc40/Makefile
diff options
context:
space:
mode:
authorGerald Pfeifer <gerald@FreeBSD.org>2004-11-07 11:40:15 +0000
committerGerald Pfeifer <gerald@FreeBSD.org>2004-11-07 11:40:15 +0000
commite862f8cb7b4d7937878588982d435220e9153f7f (patch)
treec2567832e1c74d0497e9db78cda21969afc2b22c /lang/gcc40/Makefile
parentAssign maintainership to Danny Pansters <danny@ricin.com> (diff)
Revert those changes from the prevision commit (revision 1.181) that were
accidental, considering obrien's log entry and the breakage caused. Spotted by: kris (on behalf of pointyhat)
Notes
Notes: svn path=/head/; revision=121037
Diffstat (limited to 'lang/gcc40/Makefile')
-rw-r--r--lang/gcc40/Makefile16
1 files changed, 4 insertions, 12 deletions
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index f808bf3d8f34..f638b1a8aa75 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -6,9 +6,6 @@
# $FreeBSD$
#
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA= yes
-
PORTNAME= gcc
PORTVERSION= 4.0.0
PORTREVISION= 20041024
@@ -20,16 +17,9 @@ MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING}
DISTFILES= \
gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.if !defined(WITHOUT_OBJC)
-DISTFILES+= gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_FORTRAN)
-DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_LIBJAVA)
-DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
MAINTAINER?= gerald@FreeBSD.org
COMMENT?= GNU Compiler Collection 4.0
@@ -57,6 +47,8 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build