diff options
| -rw-r--r-- | lang/gcc48-libs/Makefile | 8 | ||||
| -rw-r--r-- | lang/gcc48/Makefile | 9 | ||||
| -rw-r--r-- | lang/gcc48/distinfo | 8 | ||||
| -rw-r--r-- | lang/gcc48/version.mk | 4 |
4 files changed, 15 insertions, 14 deletions
diff --git a/lang/gcc48-libs/Makefile b/lang/gcc48-libs/Makefile index 37d8db5d718..35ca114bd31 100644 --- a/lang/gcc48-libs/Makefile +++ b/lang/gcc48-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/06/21 09:40:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.9 2013/10/21 20:26:19 adam Exp $ GCC_PKGNAME= gcc48 .include "../../lang/${GCC_PKGNAME}/version.mk" @@ -8,7 +8,7 @@ PKGNAME= ${GCC_PKGNAME}-libs-${GCC48_DIST_VERSION} ## The PKGREVISION of this package needs to be at least 1 more than the ## PKGREVISION of the lang/gcc48 package so that with the dependence pattern ## '{gcc48,gcc48-libs}>=4.8.*' pkg_all will choose gcc48-libs over gcc48. -PKGREVISION= 3 +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= # empty DISTFILES= # empty @@ -50,13 +50,13 @@ GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \ ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ; ${LIBRARY_FILES}: - ${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC48_DIST_VERSION}*' | \ + ${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC48_DIST_VERSION}*' | \ ${SED} -n -e's,^${LIBGCC_PREFIX}/,,' -e'/libexec\//d' \ -e'/libgij/d;/libgcj/d;/libjvm/d' \ -e'/lib.*\.${SHLIB_EXT}/p' >${LIBRARY_FILES} do-install: ${LIBRARY_FILES} - ${TEST} -d ${DESTDIR}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib || \ + ${TEST} -d ${DESTDIR}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib || \ ${MKDIR} ${DESTDIR}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib cd ${LIBGCC_PREFIX} && \ ${PAX} -rw ${DESTDIR}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE} <${LIBRARY_FILES} diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index ba99a79480c..52e76bc49b8 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2013/06/02 18:12:22 adam Exp $ +# $NetBSD: Makefile,v 1.10 2013/10/21 20:26:19 adam Exp $ -GCC_PKGNAME= gcc48 -.include "version.mk" +GCC_PKGNAME= gcc48 +.include "version.mk" DISTNAME= gcc-${GCC48_DIST_VERSION} PKGNAME= ${GCC_PKGNAME}-${GCC48_DIST_VERSION} @@ -59,6 +59,8 @@ LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*} BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET} # Needed on Darwin when LDFLAGS point to a SDK BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*} +# GCC does not understand this option; remove it, or stage build will fail +BUILDLINK_TRANSFORM+= rm:-stdlib=libc++ ## For target librarys and libjava programs. CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q} @@ -79,7 +81,6 @@ MAKE_ENV+= ac_cv_func_clock_gettime=yes CONFIGURE_ARGS+= --disable-bootstrap .endif - .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386) CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486 .endif diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo index ee6f43d8428..7b78468175e 100644 --- a/lang/gcc48/distinfo +++ b/lang/gcc48/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.8 2013/09/11 19:05:19 martin Exp $ +$NetBSD: distinfo,v 1.9 2013/10/21 20:26:19 adam Exp $ -SHA1 (gcc-4.8.1.tar.bz2) = 4e655032cda30e1928fcc3f00962f4238b502169 -RMD160 (gcc-4.8.1.tar.bz2) = a92c8fb9e70ad2a1caa9b3a79639a096f04382e0 -Size (gcc-4.8.1.tar.bz2) = 86753166 bytes +SHA1 (gcc-4.8.2.tar.bz2) = 810fb70bd721e1d9f446b6503afe0a9088b62986 +RMD160 (gcc-4.8.2.tar.bz2) = a417e682baa20877c290f6dc7d3d03a0c3710371 +Size (gcc-4.8.2.tar.bz2) = 85999682 bytes SHA1 (patch-gcc_Makefile.in) = b2bceb34537de1cf704f18a59aa4e4d4a4551c62 SHA1 (patch-gcc_config.gcc) = ac175c5eecf3dd53508479b30bf5c59cc0a5fca9 SHA1 (patch-gcc_config.host) = 1b1e11cd199eb93f49443d51c0063b09b7327858 diff --git a/lang/gcc48/version.mk b/lang/gcc48/version.mk index 155a9f5fbcd..8dc0d46baf8 100644 --- a/lang/gcc48/version.mk +++ b/lang/gcc48/version.mk @@ -1,2 +1,2 @@ -# $NetBSD: version.mk,v 1.5 2013/06/02 18:12:22 adam Exp $ -GCC48_DIST_VERSION:=4.8.1 +# $NetBSD: version.mk,v 1.6 2013/10/21 20:26:19 adam Exp $ +GCC48_DIST_VERSION:=4.8.2 |