summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2012-11-16 01:03:54 +0000
committerjoerg <joerg@pkgsrc.org>2012-11-16 01:03:54 +0000
commit318767726e15a81633e3768a88fa750d616db1a8 (patch)
tree50f65621a4e9d179cfb4b6820138350e96d95dca
parent7baba81fa1617a9df50a45d5fd351316e61ed19f (diff)
downloadpkgsrc-318767726e15a81633e3768a88fa750d616db1a8.tar.gz
Solaris ld accepts -rpath/foo/bar, but not -rpath=/foo/bar.
GNU ld accepts -rpath=/foo/bar, but not -rpath/foo/bar. Both accept -rpath /foo/bar, so use that.
-rw-r--r--lang/gcc47/distinfo4
-rw-r--r--lang/gcc47/patches/patch-gcc_Makefile.in4
2 files changed, 4 insertions, 4 deletions
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index ba014d27624..691cb5dac94 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2012/09/15 07:41:23 sbd Exp $
+$NetBSD: distinfo,v 1.11 2012/11/16 01:03:54 joerg Exp $
SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449
RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a
@@ -7,7 +7,7 @@ SHA1 (gcc-4.7.0.tar.bz2) = 03b8241477a9f8a34f6efe7273d92b9b6dd9fe82
RMD160 (gcc-4.7.0.tar.bz2) = 4ed660b281cdb9bcf98f5c2cf2da105c71db5be4
Size (gcc-4.7.0.tar.bz2) = 82518546 bytes
SHA1 (patch-configure) = 51c0978c60baddd90ef7e512445fdef913c04e6c
-SHA1 (patch-gcc_Makefile.in) = 9a941785a8551ba86f0b154093bfc30144046694
+SHA1 (patch-gcc_Makefile.in) = 1cf954d214a1d4a3fd4fece1f577f11b511e20ed
SHA1 (patch-gcc_config.gcc) = efa4ecabd71bdec14d5dd1f8bb836116c7a9d6e9
SHA1 (patch-gcc_config_dragonfly-stdint.h) = 740dc819b446d5f1476506322c4b280ffdb5a6c0
SHA1 (patch-gcc_config_dragonfly.h) = 82f549cdc7543b4bf413a44d481ef42b10f59c82
diff --git a/lang/gcc47/patches/patch-gcc_Makefile.in b/lang/gcc47/patches/patch-gcc_Makefile.in
index 15564b9bcd1..d041db18434 100644
--- a/lang/gcc47/patches/patch-gcc_Makefile.in
+++ b/lang/gcc47/patches/patch-gcc_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-gcc_Makefile.in,v 1.2 2012/09/13 07:19:12 sbd Exp $
+$NetBSD: patch-gcc_Makefile.in,v 1.3 2012/11/16 01:03:54 joerg Exp $
Add gcc libdir to a programs rpath so that _this gcc's_ support librarys
are found.
@@ -11,7 +11,7 @@ NOTE: the %M spec string is added by patch-gcc_gcc.c
# Language-independent files.
DRIVER_DEFINES = \
-+ -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG)$(libdir)/%M $(LINKER_RPATH_FLAG)$(prefix)/$(target_noncanonical)/lib/%M \"" \
++ -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG) $(libdir)/%M $(LINKER_RPATH_FLAG) $(prefix)/$(target_noncanonical)/lib/%M \"" \
-DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
-DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
-DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \