diff options
author | pho <pho@pkgsrc.org> | 2014-05-08 02:03:58 +0000 |
---|---|---|
committer | pho <pho@pkgsrc.org> | 2014-05-08 02:03:58 +0000 |
commit | f47135b0fb912c76e81b84bde5bb524730bc6a41 (patch) | |
tree | 2685eb84fd17c304e45810e22ce414440478b7fe /lang | |
parent | 75087cb4dadfed7b8076aa6a5d5664868824b2e9 (diff) | |
download | pkgsrc-f47135b0fb912c76e81b84bde5bb524730bc6a41.tar.gz |
Remove the whitespace between $(LINKER_RPATH_FLAG) and the path. Otherwise the flag may be misinterpreted by linker (e.g. Apple's ld)
Diffstat (limited to 'lang')
-rw-r--r-- | lang/gcc45/distinfo | 4 | ||||
-rw-r--r-- | lang/gcc45/patches/patch-ac | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo index 90d029aed83..c503ba9af69 100644 --- a/lang/gcc45/distinfo +++ b/lang/gcc45/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.8 2014/03/26 11:07:27 jperkin Exp $ +$NetBSD: distinfo,v 1.9 2014/05/08 02:03:58 pho Exp $ SHA1 (gcc-4.5.3.tar.bz2) = 73c45dfda5eef6b124be53e56828b5925198cc1b RMD160 (gcc-4.5.3.tar.bz2) = d07aa90f2186b4e082dfd5ad5d5188c097fb6247 Size (gcc-4.5.3.tar.bz2) = 66374586 bytes SHA1 (patch-aa) = c488dc25e038d97c737c8c72437660598d9e15d3 SHA1 (patch-ab) = 61bc2ebf150c6e471917e145d74e7795dc162194 -SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee +SHA1 (patch-ac) = 7da8c27d521164c1a7801dda8ca62d1057ac8d32 SHA1 (patch-ad) = b72c93d8477a567363616717e20eef1b33e7d307 SHA1 (patch-af) = 54fb9fb3438eb7c646b9d51b6b0cf3ded27d4989 SHA1 (patch-ag) = b58f8b82fcf17c60eb2700bc54d6625ca45e542b diff --git a/lang/gcc45/patches/patch-ac b/lang/gcc45/patches/patch-ac index 827319faa30..053e81da3e8 100644 --- a/lang/gcc45/patches/patch-ac +++ b/lang/gcc45/patches/patch-ac @@ -1,4 +1,9 @@ -$NetBSD: patch-ac,v 1.1 2011/10/18 17:55:27 hans Exp $ +$NetBSD: patch-ac,v 1.2 2014/05/08 02:03:58 pho Exp $ + +Add gcc libdir to a programs rpath so that _this gcc's_ support +libraries are found. Note that there must not be a whitespace between +$(LINKER_RPATH_FLAG) and the path. Otherwise the flag may be +misinterpreted by linker (e.g. Apple's ld). --- gcc/Makefile.in.orig 2004-06-17 15:56:58.000000000 -0600 +++ gcc/Makefile.in @@ -6,7 +11,7 @@ $NetBSD: patch-ac,v 1.1 2011/10/18 17:55:27 hans Exp $ # Language-independent files. DRIVER_DEFINES = \ -+ -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG) $(exec_prefix)/lib\"" \ ++ -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG)$(exec_prefix)/lib\"" \ -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \ -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \ -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \ |