diff options
Diffstat (limited to 'lang/gcc42')
-rw-r--r-- | lang/gcc42/Makefile | 57 | ||||
-rw-r--r-- | lang/gcc42/distinfo | 6 | ||||
-rw-r--r-- | lang/gcc42/files/java-patch-hier | 13 | ||||
-rw-r--r-- | lang/gcc42/pkg-descr | 8 | ||||
-rw-r--r-- | lang/gcc42/pkg-plist | 20 |
5 files changed, 9 insertions, 95 deletions
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile index bf5f1777e55c..b4030d127643 100644 --- a/lang/gcc42/Makefile +++ b/lang/gcc42/Makefile @@ -8,14 +8,13 @@ PORTNAME= gcc PORTVERSION= 4.2.5.20090325 -CATEGORIES= lang java +CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING} DISTFILES= gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \ - gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \ - gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} + gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} -MAINTAINER?= gerald@FreeBSD.org +MAINTAINER= gerald@FreeBSD.org COMMENT= GNU Compiler Collection 4.2 LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 \ @@ -31,17 +30,12 @@ USE_GMAKE= yes USE_ICONV= yes USE_PERL5_BUILD=yes MAKE_JOBS_SAFE= yes -WANT_GNOME= yes PATCH_WRKSRC= ${SRCDIR} CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure .include <bsd.port.pre.mk> -.if ${ARCH} != i386 -WITHOUT_JAVA= yes -.endif - .if ${ARCH} == "amd64" CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} .else @@ -53,7 +47,7 @@ WRKSRC= ${WRKDIR}/build TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --disable-nls \ +CONFIGURE_ARGS+=--disable-nls \ --with-system-zlib \ --with-libiconv-prefix=${LOCALBASE} \ --with-gmp=${LOCALBASE} \ @@ -78,50 +72,9 @@ INFO= gcc${SUFFIX}/cpp \ gcc${SUFFIX}/gccint \ gcc${SUFFIX}/libgomp -.if ! defined(WITHOUT_JAVA) -DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} -BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip -EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier -# FIXME: we are currently getting weird build failures with libjava on -# some 4.x and 5.x systems, which the following works around. PR 81788. -CONFIGURE_ARGS+=--disable-rpath -MAKE_ENV+= JAR=no -MAN1+= gcj${SUFFIX}.1 \ - gcj-dbtool${SUFFIX}.1 \ - gcjh${SUFFIX}.1 \ - gij${SUFFIX}.1 \ - gjnih${SUFFIX}.1 \ - grmic${SUFFIX}.1 \ - grmiregistry${SUFFIX}.1 \ - jcf-dump${SUFFIX}.1 \ - jv-scan${SUFFIX}.1 \ - jv-convert${SUFFIX}.1 -INFO+= gcc${SUFFIX}/gcj -PLIST_SUB+= JAVA="" - -.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 - -.else -CONFIGURE_ARGS+=--disable-libgcj -PLIST_SUB+= JAVA="@comment " -.endif - pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${OPSYS} ${OSREL} target=${CONFIGURE_TARGET}" -pre-extract: - @# Building libgcj with lang/gcc295 installed is causing a failure - @# about "hidden symbol `__eprintf'" in libgcc.a(_eprintf.o). - @if type gcc295 >/dev/null ; then \ - echo "This port will not build in the presence of lang/gcc295."; \ - exit 1; \ - fi - post-patch: @${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \ ${SRCDIR}/gcc/version.c @@ -137,7 +90,7 @@ 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:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax +.for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} cd ${PREFIX} ; if [ -d $d ]; then \ ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\ ${FIND} $d -type d | ${SORT} -r \ diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo index f3cce8056893..68b96c03cea0 100644 --- a/lang/gcc42/distinfo +++ b/lang/gcc42/distinfo @@ -4,9 +4,3 @@ SIZE (gcc-core-4.2-20090325.tar.bz2) = 16062670 MD5 (gcc-g++-4.2-20090325.tar.bz2) = dd0d0ef2f7fd6c112b9efdfb52501e35 SHA256 (gcc-g++-4.2-20090325.tar.bz2) = abe6f2f91a5f27b03948cb3cc2d6672540bae0f8c89055a054c0043ba57f7bb1 SIZE (gcc-g++-4.2-20090325.tar.bz2) = 4826743 -MD5 (gcc-objc-4.2-20090325.tar.bz2) = 4f90a23bf249df24682e5fc1d4042a23 -SHA256 (gcc-objc-4.2-20090325.tar.bz2) = ed7489522fbfb9ed6be9a028e3fe73018d406e206f4dd9d79b892c4b04bd3366 -SIZE (gcc-objc-4.2-20090325.tar.bz2) = 196233 -MD5 (gcc-java-4.2-20090325.tar.bz2) = 8559d9452a0ae29b935214b71baf5dfd -SHA256 (gcc-java-4.2-20090325.tar.bz2) = b5f3c1088e89d605bfee5dbfd25c77dd94b4c583ea7ff4a4c347899a76ce682e -SIZE (gcc-java-4.2-20090325.tar.bz2) = 10405140 diff --git a/lang/gcc42/files/java-patch-hier b/lang/gcc42/files/java-patch-hier deleted file mode 100644 index edb122b087b8..000000000000 --- a/lang/gcc42/files/java-patch-hier +++ /dev/null @@ -1,13 +0,0 @@ -Index: libjava/Makefile.in -=================================================================== ---- libjava/Makefile.in (revision 117734) -+++ libjava/Makefile.in (working copy) -@@ -712,7 +712,7 @@ - $(am__append_2) $(am__append_3) - toolexecmainlib_DATA = libgcj.spec - dbexec_LTLIBRARIES = libjvm.la --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig - jardir = $(datadir)/java - jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar - @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix) diff --git a/lang/gcc42/pkg-descr b/lang/gcc42/pkg-descr index e42418c77154..7f923a336784 100644 --- a/lang/gcc42/pkg-descr +++ b/lang/gcc42/pkg-descr @@ -1,6 +1,6 @@ -GCC, the GNU Compiler Collection includes C, C++, and Java. - -This port installs the various front ends as gcc42, g++42, gcj42, and -so forth into the ${PREFIX}/bin directory. +GCC, the GNU Compiler Collection, supports a number of languages. This +port installs the C and C++ front ends as gcc42 and g++42, respectively. WWW: http://gcc.gnu.org/ + +Gerald Pfeifer <gerald@FreeBSD.org> diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist index 0550586fa444..af92003847f0 100644 --- a/lang/gcc42/pkg-plist +++ b/lang/gcc42/pkg-plist @@ -10,24 +10,4 @@ bin/%%GNU_HOST%%-g++%%SUFFIX%% bin/%%GNU_HOST%%-gcc-%%GCC_VER%% bin/%%GNU_HOST%%-gcc%%SUFFIX%% info/gcc%%SUFFIX%%/dir -%%JAVA%%bin/addr2name.awk%%SUFFIX%% -%%JAVA%%bin/gappletviewer%%SUFFIX%% -%%JAVA%%bin/gcj%%SUFFIX%% -%%JAVA%%bin/gcj-dbtool%%SUFFIX%% -%%JAVA%%bin/gcjh%%SUFFIX%% -%%JAVA%%bin/gij%%SUFFIX%% -%%JAVA%%bin/gjarsigner%%SUFFIX%% -%%JAVA%%bin/gjnih%%SUFFIX%% -%%JAVA%%bin/gkeytool%%SUFFIX%% -%%JAVA%%bin/grmic%%SUFFIX%% -%%JAVA%%bin/grmiregistry%%SUFFIX%% -%%JAVA%%bin/jar%%SUFFIX%% -%%JAVA%%bin/jv-convert%%SUFFIX%% -%%JAVA%%bin/jv-scan%%SUFFIX%% -%%JAVA%%bin/jcf-dump%%SUFFIX%% -%%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%% -%%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%% -%%JAVA%%libdata/pkgconfig/libgcj-4.2.pc -%%JAVA%%share/java/libgcj-%%GCC_VER%%.jar -%%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar @comment Insert PLIST.lib here |