[pkgsrc/trunk]: pkgsrc/lang/gcc34-ada 1) Change for AMD64: The patch incorrec...

[shannonjr <shannonjr%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f928aadca8a
branches:  trunk
changeset: 478897:4f928aadca8a
user:      shannonjr <shannonjr%pkgsrc.org@localhost>
date:      Sun Aug 01 10:20:30 2004 +0000

description:
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@localhost

diffstat:

 lang/gcc34-ada/Makefile         |  5 +++--
 lang/gcc34-ada/buildlink3.mk    |  4 ++--
 lang/gcc34-ada/distinfo         |  4 ++--
 lang/gcc34-ada/patches/patch-ae |  4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diffs (73 lines):

diff -r 5c452d4a5fcb -r 4f928aadca8a lang/gcc34-ada/Makefile
--- a/lang/gcc34-ada/Makefile   Sun Aug 01 10:14:16 2004 +0000
+++ b/lang/gcc34-ada/Makefile   Sun Aug 01 10:20:30 2004 +0000
@@ -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 @@
 .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 -r 5c452d4a5fcb -r 4f928aadca8a lang/gcc34-ada/buildlink3.mk
--- a/lang/gcc34-ada/buildlink3.mk      Sun Aug 01 10:14:16 2004 +0000
+++ b/lang/gcc34-ada/buildlink3.mk      Sun Aug 01 10:20:30 2004 +0000
@@ -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+=   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 -r 5c452d4a5fcb -r 4f928aadca8a lang/gcc34-ada/distinfo
--- a/lang/gcc34-ada/distinfo   Sun Aug 01 10:14:16 2004 +0000
+++ b/lang/gcc34-ada/distinfo   Sun Aug 01 10:20:30 2004 +0000
@@ -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 -r 5c452d4a5fcb -r 4f928aadca8a lang/gcc34-ada/patches/patch-ae
--- a/lang/gcc34-ada/patches/patch-ae   Sun Aug 01 10:14:16 2004 +0000
+++ b/lang/gcc34-ada/patches/patch-ae   Sun Aug 01 10:20:30 2004 +0000
@@ -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 @@
 +
 +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 \