diff options
Diffstat (limited to 'lang/gcc34')
| -rw-r--r-- | lang/gcc34/Makefile | 21 | ||||
| -rw-r--r-- | lang/gcc34/distinfo | 4 | ||||
| -rw-r--r-- | lang/gcc34/patches/patch-ah | 16 |
3 files changed, 18 insertions, 23 deletions
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile index fd19840191d..5473a00000e 100644 --- a/lang/gcc34/Makefile +++ b/lang/gcc34/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2004/08/10 15:11:14 shannonjr Exp $ +# $NetBSD: Makefile,v 1.14 2004/08/11 19:08:15 shannonjr Exp $ # DISTNAME= gcc-${GCC_VERSION} PKGNAME= gcc34-${GCC_VERSION} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/} EXTRACT_SUFX= .tar.bz2 @@ -116,9 +116,12 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC #ALT_GCC= prefix/bin/gcc . if defined(ALT_GCC) . if exists(${ALT_GCC}) -ALT_GCC_PREFIX:= ${ALT_GCC:H}/.. -ALT_GCC_RTS!= ${FIND} ${ALT_GCC_PREFIX} -name adalib +ALT_GCC_RTS!= ${ALT_GCC} --print-file-name=adalib +. if !empty(ALT_GCC_RTS) RALT_GCC_RTS= ${ALT_GCC_RTS:S%${LOCALBASE}%%:S%/%%} +. else +PKG_SKIP_REASON= "${ALT_GCC} does not appear to be an Ada compiler" +. endif . else PKG_SKIP_REASON= "Missing bootstrap Ada compiler" . endif @@ -137,17 +140,19 @@ CPPFLAGS+= -I${BUILDLINK_DIR}/include CFLAGS+= -I${BUILDLINK_DIR}/include .if ${OPSYS} == "NetBSD" # thread / crtbegin / __cxa_atexit support depend on a "netbsd2" OS name -GCC_PLATFORM= ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OS_VERSION:C/_.*//} +GCC_PLATFORM= ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OS_VERSION:C/[_a-z].*//} CONFIGURE_ARGS+= --host=${GCC_PLATFORM} +ABI_BASELINE_PAIR= ${GCC_PLATFORM:C/--/-/} +MAKE_ENV+= ABI_BASELINE_PAIR=${ABI_BASELINE_PAIR} .endif # NetBSD post-patch: .if ${OPSYS} == "NetBSD" . if exists(${FILESDIR}/${LOWER_ARCH}-baseline_symbols${LOWER_OS_VERSION:C/\..*//}.txt) - (${TEST} -d ${WRKSRC}/libstdc++-v3/config/abi/${GCC_PLATFORM:C/--/-/} || \ - ${MKDIR} ${WRKSRC}/libstdc++-v3/config/abi/${GCC_PLATFORM:C/--/-/}) + (${TEST} -d ${WRKSRC}/libstdc++-v3/config/abi/${ABI_BASELINE_PAIR} || \ + ${MKDIR} ${WRKSRC}/libstdc++-v3/config/abi/${ABI_BASELINE_PAIR}) ${CP} ${FILESDIR}/${LOWER_ARCH}-baseline_symbols${LOWER_OS_VERSION:C/\..*//}.txt \ - ${WRKSRC}/libstdc++-v3/config/abi/${GCC_PLATFORM:C/--/-/}/baseline_symbols.txt + ${WRKSRC}/libstdc++-v3/config/abi/${ABI_BASELINE_PAIR}/baseline_symbols.txt . endif .endif (cd ${FILESDIR}; \ diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo index 07a6518f1bd..cf78fff9478 100644 --- a/lang/gcc34/distinfo +++ b/lang/gcc34/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.8 2004/08/10 15:11:14 shannonjr Exp $ +$NetBSD: distinfo,v 1.9 2004/08/11 19:08:15 shannonjr Exp $ SHA1 (gcc-3.4.1.tar.bz2) = 04de377eff57e614b089b8946a520de0dac7248e Size (gcc-3.4.1.tar.bz2) = 27182385 bytes SHA1 (patch-ae) = 0a12deda859c553eda6b877779525e391451021a SHA1 (patch-af) = cdd6b0d13c557996cb6582d7fa5dc651d37ee0ee SHA1 (patch-ag) = beee5294d387faafa640ab048823499da629e715 -SHA1 (patch-ah) = f680066ac285cd9cd3fea6713ce3e8a6d0e1c14c +SHA1 (patch-ah) = a7b7dee27140f4dc036ede393a4808ad1d63f665 SHA1 (patch-ai) = 78320fde6d073cb4bc87b281b83168f173344341 SHA1 (patch-aj) = ea0bef88be9e823ed2acfa54a59f29016de8cc5e SHA1 (patch-ak) = 1188e98e65fce3b968f9a2c211ffe315644d87d5 diff --git a/lang/gcc34/patches/patch-ah b/lang/gcc34/patches/patch-ah index a68504fd9c1..cb1e7212761 100644 --- a/lang/gcc34/patches/patch-ah +++ b/lang/gcc34/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.1 2004/07/28 12:14:49 shannonjr Exp $ +$NetBSD: patch-ah,v 1.2 2004/08/11 19:08:15 shannonjr Exp $ --- libstdc++-v3/configure.host.orig 2004-03-18 10:36:12.000000000 -0700 +++ libstdc++-v3/configure.host @@ -6,19 +6,9 @@ $NetBSD: patch-ah,v 1.1 2004/07/28 12:14:49 shannonjr Exp $ x86_64-*-linux*) abi_baseline_pair="x86_64-linux-gnu" ;; -+ x86_64-*-netbsd*) -+ abi_baseline_pair="x86_64-netbsdelf2.0" ++ *-netbsd*) ++ abi_baseline_pair=${ABI_BASELINE_PAIR} + ;; alpha*-*-freebsd5*) abi_baseline_pair="alpha-freebsd5" ;; -@@ -236,6 +239,9 @@ case "${host}" in - i*86-*-freebsd5*) - abi_baseline_pair="i386-freebsd5" - ;; -+ i*86-*-netbsd*) -+ abi_baseline_pair="i386-netbsdelf2.0" -+ ;; - sparc*-*-freebsd5*) - abi_baseline_pair="sparc-freebsd5" - ;; |