summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoragc <agc>2004-07-06 22:42:17 +0000
committeragc <agc>2004-07-06 22:42:17 +0000
commita00fe8819e24631b65fd2e61a03e1e020bf34ad0 (patch)
tree0dd60e694468ff0a78bf4120bfda42e6f71106d8
parentc6fed8c29eb0d4c38e92b804e445ccec575d40b5 (diff)
downloadpkgsrc-a00fe8819e24631b65fd2e61a03e1e020bf34ad0.tar.gz
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.
-rw-r--r--doc/CHANGES-pkgsrc-2004Q23
-rw-r--r--lang/gcc3/Makefile.common9
2 files changed, 10 insertions, 2 deletions
diff --git a/doc/CHANGES-pkgsrc-2004Q2 b/doc/CHANGES-pkgsrc-2004Q2
index 1c0d7674f8a..bbb10c3cc52 100644
--- a/doc/CHANGES-pkgsrc-2004Q2
+++ b/doc/CHANGES-pkgsrc-2004Q2
@@ -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 41, requested by Matthias Drochner [agc 2004-07-06]
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 --git a/lang/gcc3/Makefile.common b/lang/gcc3/Makefile.common
index f5711896d4b..b7fa041e402 100644
--- a/lang/gcc3/Makefile.common
+++ b/lang/gcc3/Makefile.common
@@ -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+= --enable-shared
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"