diff options
| author | wiz <wiz> | 2003-05-22 09:37:27 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2003-05-22 09:37:27 +0000 |
| commit | 6be71d4a1525993bbc93251f71585c2378dadd3a (patch) | |
| tree | 9f6d1b6f39deab3d2de9127bfb258a73e8062d75 /lang/gcc3 | |
| parent | 1e38bf5508d141ccf3c760c4b6097b7b56375b87 (diff) | |
| download | pkgsrc-6be71d4a1525993bbc93251f71585c2378dadd3a.tar.gz | |
Add patch from Todd Vierling in PR 21226:
The following method overrides "libgcc_link_spec" in the generated specs
file, which gives you a compiler that automatically inserts the correct
rpath argument at link time. This should work for any pkgsrc target
platform, as no platform-specific config overrides it.
Additionally, part of this fix changes the "scrubbed" LDFLAGS by
overriding that in CONFIGURE_ENV, rather than globally. Other changes to
the pkgsrc Makefile (including one I plan to submit for threads support)
may need access to the "real" LDFLAGS, so overriding it wholesale in the
pkg Makefile is Bad.
Bump version to 3.2.2nb2.
Diffstat (limited to 'lang/gcc3')
| -rw-r--r-- | lang/gcc3/Makefile | 7 | ||||
| -rw-r--r-- | lang/gcc3/distinfo | 3 | ||||
| -rw-r--r-- | lang/gcc3/patches/patch-ab | 12 |
3 files changed, 18 insertions, 4 deletions
diff --git a/lang/gcc3/Makefile b/lang/gcc3/Makefile index 5f67ab0dc29..70b955b0955 100644 --- a/lang/gcc3/Makefile +++ b/lang/gcc3/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2003/05/06 17:41:38 jmmv Exp $ +# $NetBSD: Makefile,v 1.12 2003/05/22 09:37:27 wiz Exp $ # DISTNAME= gcc-3.2.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/} @@ -75,7 +75,8 @@ post-install: .include "../../mk/bsd.pkg.mk" # Make bootstrap with compiler != gcc possible. -LDFLAGS= ${_STRIPFLAG_CC} +CONFIGURE_ENV+= LDFLAGS="${_STRIPFLAG_CC}" +MAKE_ENV+= GCC_PREFIX="${GCC_PREFIX}" # On NetBSD, the gcc-2.95.3 for: # diff --git a/lang/gcc3/distinfo b/lang/gcc3/distinfo index f69c566233c..07656c2e80f 100644 --- a/lang/gcc3/distinfo +++ b/lang/gcc3/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.4 2003/04/14 04:30:21 salo Exp $ +$NetBSD: distinfo,v 1.5 2003/05/22 09:37:27 wiz Exp $ SHA1 (gcc-3.2.2.tar.gz) = 152883d3e1f6190298cb7be43076abeaeac6c2a9 Size (gcc-3.2.2.tar.gz) = 26664960 bytes SHA1 (patch-aa) = 6e9e7eeb7e9ddc043eb2b7c3cb05e7b6112e813b +SHA1 (patch-ab) = c5d7023257047c52fad595bd5ddee3641aaa142f diff --git a/lang/gcc3/patches/patch-ab b/lang/gcc3/patches/patch-ab new file mode 100644 index 00000000000..8e273eb3f17 --- /dev/null +++ b/lang/gcc3/patches/patch-ab @@ -0,0 +1,12 @@ +$NetBSD: patch-ab,v 1.1 2003/05/22 09:37:28 wiz Exp $ + +--- gcc/Makefile.in.orig Fri Apr 18 08:36:04 2003 ++++ gcc/Makefile.in +@@ -1236,6 +1236,7 @@ c-semantics.o : c-semantics.c $(CONFIG_H + # Language-independent files. + + DRIVER_DEFINES = \ ++ -DLINK_LIBGCC_SPEC="\"%D $(RPATH_FLAG)$(GCC_PREFIX)/lib\"" \ + -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \ + -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \ + -DDEFAULT_TARGET_VERSION=\"$(version)\" \ |