diff options
| author | shannonjr <shannonjr> | 2004-08-01 10:20:30 +0000 |
|---|---|---|
| committer | shannonjr <shannonjr> | 2004-08-01 10:20:30 +0000 |
| commit | c61479ec3e8823d2a81b298ed3a9591dd39cde17 (patch) | |
| tree | c59801f4da97d5ed7943c5da5db836c2688caf0f /lang/gcc34-ada | |
| parent | f3c7cc76d96b1da124d554fc1230b471ebbdeeeb (diff) | |
| download | pkgsrc-c61479ec3e8823d2a81b298ed3a9591dd39cde17.tar.gz | |
1) Change for AMD64: The patch incorrectly AMD64 to be identified
as x86_64--netbsdelf when it is identified as x86_64--netbsd.
2) Check the version of as using the just-computed ${AS_PATH}, not ${AS},
following the change to gcc3/Makefile.common submitted by jlam@netbsd.org
Diffstat (limited to 'lang/gcc34-ada')
| -rw-r--r-- | lang/gcc34-ada/Makefile | 5 | ||||
| -rw-r--r-- | lang/gcc34-ada/buildlink3.mk | 4 | ||||
| -rw-r--r-- | lang/gcc34-ada/distinfo | 4 | ||||
| -rw-r--r-- | lang/gcc34-ada/patches/patch-ae | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/lang/gcc34-ada/Makefile b/lang/gcc34-ada/Makefile index 61e988a8977..d2e5e529318 100644 --- a/lang/gcc34-ada/Makefile +++ b/lang/gcc34-ada/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2004/07/28 21:40:21 shannonjr Exp $ +# $NetBSD: Makefile,v 1.6 2004/08/01 10:20:30 shannonjr Exp $ # DISTNAME= gcc-${GCC_VERSION} PKGNAME= gcc34-ada-${GCC_VERSION} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/} EXTRACT_SUFX= .tar.bz2 @@ -52,6 +52,7 @@ MAKEFLAGS+= USE_BINUTILS=${USE_BINUTILS} .if defined(USE_BINUTILS) && !empty(USE_BINUTILS:M[yY][eE][sS]) DEPENDS+= binutils>=2.14:../../devel/binutils CONFIGURE_ARGS+= --with-as=${LOCALBASE}/bin/as +CONFIGURE_ARGS+= --with-ld=${LOCALBASE}/bin/ld CONFIGURE_ARGS+= --with-gnu-as CONFIGURE_ARGS+= --with-gnu-ld .endif diff --git a/lang/gcc34-ada/buildlink3.mk b/lang/gcc34-ada/buildlink3.mk index a4ddcb93d20..5656e373996 100644 --- a/lang/gcc34-ada/buildlink3.mk +++ b/lang/gcc34-ada/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/07/28 21:40:21 shannonjr Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/08/01 10:20:30 shannonjr Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GCCADA_BUILDLINK3_MK:= ${GCCADA_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc34-ada} BUILDLINK_PACKAGES+= gcc34-ada .if !empty(GCCADA_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.gcc34-ada+= gcc34-ada>=3.4.1nb3 +BUILDLINK_DEPENDS.gcc34-ada+= gcc34-ada>=3.4.1nb4 BUILDLINK_PKGSRCDIR.gcc34-ada?= ../../lang/gcc34-ada BUILDLINK_ENV+= ADAC=${BUILDLINK_PREFIX.gcc34-ada}/bin/gcc . if exists(${BUILDLINK_PREFIX.gcc34-ada}/bin/gcc) diff --git a/lang/gcc34-ada/distinfo b/lang/gcc34-ada/distinfo index e89e5119a89..770901f227d 100644 --- a/lang/gcc34-ada/distinfo +++ b/lang/gcc34-ada/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2004/07/28 12:04:08 shannonjr Exp $ +$NetBSD: distinfo,v 1.5 2004/08/01 10:20:30 shannonjr Exp $ SHA1 (gcc-3.4.1.tar.bz2) = 04de377eff57e614b089b8946a520de0dac7248e Size (gcc-3.4.1.tar.bz2) = 27182385 bytes -SHA1 (patch-ae) = 9b9e4ec15815626c81936460ce834303381f001c +SHA1 (patch-ae) = 0a12deda859c553eda6b877779525e391451021a SHA1 (patch-af) = cdd6b0d13c557996cb6582d7fa5dc651d37ee0ee SHA1 (patch-ag) = beee5294d387faafa640ab048823499da629e715 SHA1 (patch-ba) = 6fc03fc155f630329f7dc831eece6b6464b453a6 diff --git a/lang/gcc34-ada/patches/patch-ae b/lang/gcc34-ada/patches/patch-ae index c0c8a3537ef..e080e00a567 100644 --- a/lang/gcc34-ada/patches/patch-ae +++ b/lang/gcc34-ada/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1.1.1 2004/06/29 18:00:17 shannonjr Exp $ +$NetBSD: patch-ae,v 1.2 2004/08/01 10:20:30 shannonjr Exp $ --- gcc/ada/Makefile.in.orig 2004-01-26 14:57:32.000000000 -0700 +++ gcc/ada/Makefile.in @@ -30,7 +30,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2004/06/29 18:00:17 shannonjr Exp $ + +endif + -+ifeq ($(strip $(filter-out %x86_64 netbsdelf%,$(arch) $(osys))),) ++ifeq ($(strip $(filter-out %x86_64 netbsd%,$(arch) $(osys))),) + LIBGNAT_TARGET_PAIRS = \ + a-numaux.adb<86numaux.adb \ + a-numaux.ads<86numaux.ads \ |