From f369fc50b4bc429e3a7c817866f72e3812362ef0 Mon Sep 17 00:00:00 2001 From: Gerald Pfeifer Date: Thu, 22 Dec 2005 00:47:46 +0000 Subject: Update to the 20051215 snapshot of GCC 4.0.3. Install the .info files of the lang/gcc40 port in a port-specific subdirectory, and move include/mf-runtime.h into a version specific directory. This allows us to remove the conflicts with lang/gcc33, lang/gcc41 and lang/gcc42. Also, convert pkg-plist to use a new substitution (%%SUFFIX%%) instead of hardcoding the version number 40. --- lang/gcc/Makefile | 2 +- lang/gcc33/Makefile | 2 +- lang/gcc40/Makefile | 19 +++++++++++++------ lang/gcc40/distinfo | 30 +++++++++++++++--------------- lang/gcc40/pkg-plist | 25 +++++++++++++------------ lang/gcc41/Makefile | 2 +- lang/gcc42/Makefile | 2 +- lang/gcc43/Makefile | 2 +- lang/gcc44/Makefile | 2 +- lang/gcc45/Makefile | 2 +- lang/gcc46/Makefile | 2 +- lang/gcc47/Makefile | 2 +- lang/gcc48/Makefile | 2 +- 13 files changed, 51 insertions(+), 43 deletions(-) (limited to 'lang') diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 8232cedc1073..4dbb0af31c6f 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr .endif -CONFLICTS= gcc-4.0.* gcc-4.1.* +CONFLICTS= gcc-4.1.* LATEST_LINK?= gcc42${PKGNAMESUFFIX} NOT_FOR_ARCHS= alpha USE_BISON= yes diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile index fd158af88a2d..230285761339 100644 --- a/lang/gcc33/Makefile +++ b/lang/gcc33/Makefile @@ -24,7 +24,7 @@ DISTFILES= \ MAINTAINER?= gerald@FreeBSD.org COMMENT?= GNU Compiler Collection 3.3 -CONFLICTS= gcc-4.0.* gcc-4.1.* +CONFLICTS= gcc-4.1.* LATEST_LINK?= gcc33${PKGNAMESUFFIX} USE_BISON= yes USE_BZIP2= yes diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile index c5014af51b45..f1dc50ba7c45 100644 --- a/lang/gcc40/Makefile +++ b/lang/gcc40/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.0.3 -PORTREVISION= 20051208 +PORTREVISION= 20051215 CATEGORIES= lang VERSIONSTRING= 4.0-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -29,7 +29,6 @@ LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr .endif -CONFLICTS= gcc-3.3.* gcc-4.1.* LATEST_LINK?= gcc40${PKGNAMESUFFIX} USE_BISON= yes USE_BZIP2= yes @@ -60,7 +59,8 @@ CONFIGURE_ARGS+= --disable-nls \ --with-libiconv-prefix=${LOCALBASE} \ --program-suffix=${SUFFIX} \ --libdir=${TARGLIB} \ - --with-gxx-include-dir=${TARGLIB}/include/c++/ + --with-gxx-include-dir=${TARGLIB}/include/c++/ \ + --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX} CONFIGURE_ENV= RANLIB=: .if defined(WITH_FORTRAN) CONFIGURE_ARGS+= --with-gmp=${LOCALBASE} @@ -74,16 +74,21 @@ LDCONFIG_DIRS= ${TARGLIB} CONFIGURE_ARGS+= --disable-shared .endif ALL_TARGET= bootstrap-lean -PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} +PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \ + SUFFIX=${SUFFIX} MAN1= cpp${SUFFIX}.1 \ g++${SUFFIX}.1 \ gcc${SUFFIX}.1 \ gcov${SUFFIX}.1 -INFO= cpp cppinternals gcc gccinstall gccint +INFO= gcc${SUFFIX}/cpp \ + gcc${SUFFIX}/cppinternals \ + gcc${SUFFIX}/gcc \ + gcc${SUFFIX}/gccinstall \ + gcc${SUFFIX}/gccint .if defined(WITH_FORTRAN) MAN1+= gfortran${SUFFIX}.1 -INFO+= gfortran +INFO+= gcc${SUFFIX}/gfortran PLIST_SUB+= FORTRAN="" .else PLIST_SUB+= FORTRAN="@comment " @@ -125,6 +130,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 diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo index f667f5445083..e1c7b0609853 100644 --- a/lang/gcc40/distinfo +++ b/lang/gcc40/distinfo @@ -1,15 +1,15 @@ -MD5 (gcc-core-4.0-20051208.tar.bz2) = c373ed57a9edced3534029d9e1bd3dab -SHA256 (gcc-core-4.0-20051208.tar.bz2) = ea6d6bbb48697fc13ef10c0846c90aac60d6998ca9e0a26236570008616e32af -SIZE (gcc-core-4.0-20051208.tar.bz2) = 13776335 -MD5 (gcc-g++-4.0-20051208.tar.bz2) = 16659680aea8399ba6a80173026be95e -SHA256 (gcc-g++-4.0-20051208.tar.bz2) = 0e9f63a3cd440afb74362aaa6ff05350004e0a79bb5407f3c269087ecec55cd1 -SIZE (gcc-g++-4.0-20051208.tar.bz2) = 2706280 -MD5 (gcc-objc-4.0-20051208.tar.bz2) = 0b0811b970096f8cb74aaabdea95f903 -SHA256 (gcc-objc-4.0-20051208.tar.bz2) = ec451315b83af503faf0c93832c87b2a8cd5a37bdab3e4b4392b37bfd4218943 -SIZE (gcc-objc-4.0-20051208.tar.bz2) = 180041 -MD5 (gcc-testsuite-4.0-20051208.tar.bz2) = 37fe82002883877b1146563ebd4c9e48 -SHA256 (gcc-testsuite-4.0-20051208.tar.bz2) = 8d2ba49d979de4833c8152330697e116bc13f0a21340fe094153456797977ffc -SIZE (gcc-testsuite-4.0-20051208.tar.bz2) = 3269793 -MD5 (gcc-fortran-4.0-20051208.tar.bz2) = 910b2266fdcbd85832d4bcabe8d76418 -SHA256 (gcc-fortran-4.0-20051208.tar.bz2) = 837e3908232af6d40d2e29b63e74b7364aecc9f6438763f06e61d5cc610d8cd3 -SIZE (gcc-fortran-4.0-20051208.tar.bz2) = 628957 +MD5 (gcc-core-4.0-20051215.tar.bz2) = 3d76715952929fc0accffcf6b2ab3e8a +SHA256 (gcc-core-4.0-20051215.tar.bz2) = 3eed155026e1dd192939a617d1db03e9c51bf5fa235e5f5aa2fe6e2545fac594 +SIZE (gcc-core-4.0-20051215.tar.bz2) = 13777924 +MD5 (gcc-g++-4.0-20051215.tar.bz2) = 082a4da5425fe8cb0d96d96b927218a0 +SHA256 (gcc-g++-4.0-20051215.tar.bz2) = 755bb29850e406637bd62294f6612b61b33de102bbb8ec2dd65ae4b57a053b4d +SIZE (gcc-g++-4.0-20051215.tar.bz2) = 2707527 +MD5 (gcc-objc-4.0-20051215.tar.bz2) = 505a98d1f2d95b1e2ba9858dfe3d1bcd +SHA256 (gcc-objc-4.0-20051215.tar.bz2) = 66b7c115ea4e525e2791164f1f12b3105943d94eadb9e2d8308c722bc5df3d58 +SIZE (gcc-objc-4.0-20051215.tar.bz2) = 180033 +MD5 (gcc-testsuite-4.0-20051215.tar.bz2) = db594e27f5ee698e16ff1ce4e00e6508 +SHA256 (gcc-testsuite-4.0-20051215.tar.bz2) = d12f22476aed963702e512b1683763e7ff4a6d9a8f30b28c21d08642413a283a +SIZE (gcc-testsuite-4.0-20051215.tar.bz2) = 3267720 +MD5 (gcc-fortran-4.0-20051215.tar.bz2) = a80c71aea160b1cd0e233b6d5b85643d +SHA256 (gcc-fortran-4.0-20051215.tar.bz2) = 0d1a46e79767b767550606abf86158157db5ee3a3975ce596379d2b7f3a77c41 +SIZE (gcc-fortran-4.0-20051215.tar.bz2) = 629147 diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist index 1ef4f04b3886..025c31904c99 100644 --- a/lang/gcc40/pkg-plist +++ b/lang/gcc40/pkg-plist @@ -1,15 +1,16 @@ @comment $FreeBSD$ -bin/c++40 -bin/cpp40 -bin/g++40 -bin/gcc40 -bin/gcov40 -bin/gccbug40 -bin/%%GNU_HOST%%-c++40 -bin/%%GNU_HOST%%-g++40 +bin/c++%%SUFFIX%% +bin/cpp%%SUFFIX%% +bin/g++%%SUFFIX%% +bin/gcc%%SUFFIX%% +bin/gccbug%%SUFFIX%% +bin/gcov%%SUFFIX%% +bin/%%GNU_HOST%%-c++%%SUFFIX%% +bin/%%GNU_HOST%%-g++%%SUFFIX%% bin/%%GNU_HOST%%-gcc-%%GCC_VER%% -bin/%%GNU_HOST%%-gcc40 -include/mf-runtime.h -%%FORTRAN%%bin/gfortran40 -%%FORTRAN%%bin/%%GNU_HOST%%-gfortran40 +bin/%%GNU_HOST%%-gcc%%SUFFIX%% +info/gcc%%SUFFIX%%/dir +@unexec rmdir %D/info/gcc%%SUFFIX%% 2>/dev/null || true +%%FORTRAN%%bin/gfortran%%SUFFIX%% +%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%% @comment Insert PLIST.lib here diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile index a7af46c6cf59..de37792c1642 100644 --- a/lang/gcc41/Makefile +++ b/lang/gcc41/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr .endif -CONFLICTS= gcc-3.3.* gcc-4.0.* gcc-4.2.* +CONFLICTS= gcc-3.3.* gcc-4.2.* LATEST_LINK?= gcc41${PKGNAMESUFFIX} NOT_FOR_ARCHS= alpha USE_BISON= yes diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile index 8232cedc1073..4dbb0af31c6f 100644 --- a/lang/gcc42/Makefile +++ b/lang/gcc42/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr .endif -CONFLICTS= gcc-4.0.* gcc-4.1.* +CONFLICTS= gcc-4.1.* LATEST_LINK?= gcc42${PKGNAMESUFFIX} NOT_FOR_ARCHS= alpha USE_BISON= yes diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile index 8232cedc1073..4dbb0af31c6f 100644 --- a/lang/gcc43/Makefile +++ b/lang/gcc43/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr .endif -CONFLICTS= gcc-4.0.* gcc-4.1.* +CONFLICTS= gcc-4.1.* LATEST_LINK?= gcc42${PKGNAMESUFFIX} NOT_FOR_ARCHS= alpha USE_BISON= yes diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile index 8232cedc1073..4dbb0af31c6f 100644 --- a/lang/gcc44/Makefile +++ b/lang/gcc44/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr .endif -CONFLICTS= gcc-4.0.* gcc-4.1.* +CONFLICTS= gcc-4.1.* LATEST_LINK?= gcc42${PKGNAMESUFFIX} NOT_FOR_ARCHS= alpha USE_BISON= yes diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile index 8232cedc1073..4dbb0af31c6f 100644 --- a/lang/gcc45/Makefile +++ b/lang/gcc45/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr .endif -CONFLICTS= gcc-4.0.* gcc-4.1.* +CONFLICTS= gcc-4.1.* LATEST_LINK?= gcc42${PKGNAMESUFFIX} NOT_FOR_ARCHS= alpha USE_BISON= yes diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index 8232cedc1073..4dbb0af31c6f 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr .endif -CONFLICTS= gcc-4.0.* gcc-4.1.* +CONFLICTS= gcc-4.1.* LATEST_LINK?= gcc42${PKGNAMESUFFIX} NOT_FOR_ARCHS= alpha USE_BISON= yes diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index 8232cedc1073..4dbb0af31c6f 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr .endif -CONFLICTS= gcc-4.0.* gcc-4.1.* +CONFLICTS= gcc-4.1.* LATEST_LINK?= gcc42${PKGNAMESUFFIX} NOT_FOR_ARCHS= alpha USE_BISON= yes diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index 8232cedc1073..4dbb0af31c6f 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr .endif -CONFLICTS= gcc-4.0.* gcc-4.1.* +CONFLICTS= gcc-4.1.* LATEST_LINK?= gcc42${PKGNAMESUFFIX} NOT_FOR_ARCHS= alpha USE_BISON= yes -- cgit v1.2.3