[pkgsrc/pkgsrc-2004Q2]: pkgsrc Pullup ticket 45 to the pkgsrc-2004Q2 branch, ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8752188fd841
branches:  pkgsrc-2004Q2
changeset: 476710:8752188fd841
user:      agc <agc%pkgsrc.org@localhost>
date:      Tue Jul 06 22:42:17 2004 +0000

description:
Pullup ticket 45 to the pkgsrc-2004Q2 branch, requested by Grant Beattie.

        Module Name:    pkgsrc
        Committed By:   grant
        Date:           Sat Jul  3 12:15:22 UTC 2004

        Modified Files:
                pkgsrc/lang/gcc3: Makefile.common

        Log Message:
        always build gcc3 sub-packages with gcc3-c.

diffstat:

 doc/CHANGES-pkgsrc-2004Q2 |  3 ++-
 lang/gcc3/Makefile.common |  9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r fbe8f2f57e23 -r 8752188fd841 doc/CHANGES-pkgsrc-2004Q2
--- a/doc/CHANGES-pkgsrc-2004Q2 Tue Jul 06 22:39:37 2004 +0000
+++ b/doc/CHANGES-pkgsrc-2004Q2 Tue Jul 06 22:42:17 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.9 2004/07/06 22:39:37 agc Exp $
+$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.10 2004/07/06 22:42:17 agc Exp $
 
 Changes to the packages collection and infrastructure on the
 pkgsrc-2004Q2 branch:
@@ -11,4 +11,5 @@
 Pullup ticket 42, requested by Dieter Baron [agc 2004-07-06]
 Pullup ticket 43, requested by Gavan Fantom [agc 2004-07-06]
 Pullup ticket 44, requested by Grant Beattie [agc 2004-07-06]
+Pullup ticket 45, requested by Grant Beattie [agc 2004-07-06]
 
diff -r fbe8f2f57e23 -r 8752188fd841 lang/gcc3/Makefile.common
--- a/lang/gcc3/Makefile.common Tue Jul 06 22:39:37 2004 +0000
+++ b/lang/gcc3/Makefile.common Tue Jul 06 22:42:17 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2004/05/16 03:16:42 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.5.2.1 2004/07/06 22:42:17 agc Exp $
 
 GCC_VERSION=   3.3.3
 DISTNAME=      gcc-${GCC_VERSION}
@@ -98,6 +98,13 @@
 CONFIGURE_ARGS+=       --disable-shared
 .endif
 
+# gcc3 sub-packages must be built with gcc3.
+.if defined(PKGNAME) && empty(PKGNAME:Mgcc3-c-[0-9]*)
+ONLY_FOR_COMPILER+=    gcc
+PKGSRC_COMPILER:=      gcc ${PKGSRC_COMPILER}
+GCC_REQD+=             ${GCC_VERSION}
+.endif
+
 .include "../../mk/compiler.mk"
 
 .if ${OPSYS} == "IRIX"