summaryrefslogtreecommitdiff
path: root/lang/gcc41
diff options
context:
space:
mode:
authorGerald Pfeifer <gerald@FreeBSD.org>2007-04-10 05:24:27 +0000
committerGerald Pfeifer <gerald@FreeBSD.org>2007-04-10 05:24:27 +0000
commitc5561ca73618814ecd0aa5caaba9bc511ddfea0e (patch)
tree1bd7dac0dde942ee2495e6b8add177385cb46a07 /lang/gcc41
parentUpdate to 2.18.1. (diff)
Update to the 20070409 snapshot of GCC 4.1.3.
Move everything related to the WITH_JAVA_AWT knob into a single block and make this a subset of the general Java-specific section.[1] Submitted by: alepulver[1]
Notes
Notes: svn path=/head/; revision=189632
Diffstat (limited to 'lang/gcc41')
-rw-r--r--lang/gcc41/Makefile23
-rw-r--r--lang/gcc41/distinfo36
2 files changed, 27 insertions, 32 deletions
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 31f530eebaa6..82a72eeb0151 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.3
-PORTREVISION= 20070402
+PORTREVISION= 20070409
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -25,9 +25,6 @@ COMMENT?= GNU Compiler Collection 4.1
LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 \
mpfr.1:${PORTSDIR}/math/mpfr
.endif
-.if defined(WITH_JAVA_AWT)
-LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo
-.endif
SUFFIX= 41
LATEST_LINK?= gcc${SUFFIX}${PKGNAMESUFFIX}
@@ -37,9 +34,6 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_ICONV= yes
USE_PERL5_BUILD=yes
-.if defined(WITH_JAVA_AWT)
-USE_GNOME= gtk20 libartlgpl2
-.endif
PATCH_WRKSRC= ${SRCDIR}
CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure
@@ -68,13 +62,6 @@ CONFIGURE_ARGS+= --disable-nls \
--libdir=${TARGLIB} \
--with-gxx-include-dir=${TARGLIB}/include/c++/ \
--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
-.if defined(WITH_JAVA_AWT)
-CONFIGURE_ARGS+= --enable-java-awt=gtk,xlib \
- --enable-gtk-cairo
-.if defined(WITHOUT_JAVA)
-BROKEN= Does not compile gcj
-.endif
-.endif
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
ALL_TARGET= bootstrap-lean
USE_LDCONFIG= ${TARGLIB}
@@ -124,6 +111,14 @@ PLIST_SUB+= JAVA=""
.else
CONFIGURE_ARGS+=--disable-libgcj
PLIST_SUB+= JAVA="@comment "
+
+.if defined(WITH_JAVA_AWT)
+LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo
+USE_GNOME= gtk20 libartlgpl2
+CONFIGURE_ARGS+= --enable-java-awt=gtk,xlib \
+ --enable-gtk-cairo
+.endif
+
.endif
pre-everything::
diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo
index 703a53ed87de..5ea525bcf7c8 100644
--- a/lang/gcc41/distinfo
+++ b/lang/gcc41/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.1-20070402.tar.bz2) = 1ea8ed064edb2c6673d08b507c9e61a0
-SHA256 (gcc-core-4.1-20070402.tar.bz2) = 097af594f37ff606dc152edfb36606f1c76df6e01f28a4b014a30f9cc79d1f9f
-SIZE (gcc-core-4.1-20070402.tar.bz2) = 15252396
-MD5 (gcc-g++-4.1-20070402.tar.bz2) = 008b66ea51082e618c5c0e300aaa6830
-SHA256 (gcc-g++-4.1-20070402.tar.bz2) = 580b555eba83521c64b1485726d08aa67ef3294f800caaee11f9dc09d994dc9e
-SIZE (gcc-g++-4.1-20070402.tar.bz2) = 3846448
-MD5 (gcc-objc-4.1-20070402.tar.bz2) = bb14bd721571b38c382877df65fb9af2
-SHA256 (gcc-objc-4.1-20070402.tar.bz2) = 09ddeba4184c0cd8ee125ac9a39659be617963bc3803864505e576ffeb0742d0
-SIZE (gcc-objc-4.1-20070402.tar.bz2) = 190864
-MD5 (gcc-testsuite-4.1-20070402.tar.bz2) = b5fccc60f289631b703a35da14fdb4b5
-SHA256 (gcc-testsuite-4.1-20070402.tar.bz2) = 636e2332a5b0ee7ed5fe1f30ad8182b72cac584b7a2e165f04e83b85c49c7dd1
-SIZE (gcc-testsuite-4.1-20070402.tar.bz2) = 3613753
-MD5 (gcc-fortran-4.1-20070402.tar.bz2) = 6ba66654815106b47ada478124295c56
-SHA256 (gcc-fortran-4.1-20070402.tar.bz2) = a6d8c6a3325ae0980641f7e0e944b64e86fe7f64f98781ae8c2b038d5e9f0d92
-SIZE (gcc-fortran-4.1-20070402.tar.bz2) = 792850
-MD5 (gcc-java-4.1-20070402.tar.bz2) = cf2610eda3b05f061ba53bdb1ce35a67
-SHA256 (gcc-java-4.1-20070402.tar.bz2) = e4a75927f3aa6c313c936f97d78ed6b9c498d4313f1fce7b473b68f7bbf8d587
-SIZE (gcc-java-4.1-20070402.tar.bz2) = 9089152
+MD5 (gcc-core-4.1-20070409.tar.bz2) = 895ba7ca21b8ca0a66eaa9829ef6fc35
+SHA256 (gcc-core-4.1-20070409.tar.bz2) = 1e97abecc8d4359367036da0b380ce6fabc9967c7acab93b0a9f4715b1dd4849
+SIZE (gcc-core-4.1-20070409.tar.bz2) = 15252128
+MD5 (gcc-g++-4.1-20070409.tar.bz2) = 1adb9bd92d7912208bf8af0205268358
+SHA256 (gcc-g++-4.1-20070409.tar.bz2) = 809f545555ab9d1c1333ccc0daf837e051de790d3c8ff347da1490264239a181
+SIZE (gcc-g++-4.1-20070409.tar.bz2) = 3845563
+MD5 (gcc-objc-4.1-20070409.tar.bz2) = e65e1cc63625b400fe670d507e42753a
+SHA256 (gcc-objc-4.1-20070409.tar.bz2) = f815f2ab0085b07a9280507bdb1701cb15ed73e307ae69be4ef8435217646470
+SIZE (gcc-objc-4.1-20070409.tar.bz2) = 190886
+MD5 (gcc-testsuite-4.1-20070409.tar.bz2) = da594706f39ae3a1ae5b64a8c5358006
+SHA256 (gcc-testsuite-4.1-20070409.tar.bz2) = d958342492b2c599c9619a564b2d0f1c837640d0fc2ff6889381c205fc32627f
+SIZE (gcc-testsuite-4.1-20070409.tar.bz2) = 3613580
+MD5 (gcc-fortran-4.1-20070409.tar.bz2) = 973bdbb153d55c05291e6c333db52457
+SHA256 (gcc-fortran-4.1-20070409.tar.bz2) = 1392cc860867492c9306a6c4d68456f5242837eb328e4bc28980baa5d23de97f
+SIZE (gcc-fortran-4.1-20070409.tar.bz2) = 792991
+MD5 (gcc-java-4.1-20070409.tar.bz2) = 2a7305776842ac311aa073ae6b20c3bf
+SHA256 (gcc-java-4.1-20070409.tar.bz2) = 2afa89cb8d0b069b4e3a872c4e2e1e3e8a293484bfb895f4d330152f5b235b69
+SIZE (gcc-java-4.1-20070409.tar.bz2) = 9087376