[pkgsrc/trunk]: pkgsrc/lang/gcc45 Darwin: Fix an issue that gcc producing bin...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1d3b20e4d951
branches:  trunk
changeset: 634067:1d3b20e4d951
user:      pho <pho%pkgsrc.org@localhost>
date:      Thu May 08 10:14:46 2014 +0000

description:
Darwin: Fix an issue that gcc producing binaries linked with a wrong libgcc_s

If we don't install libgcc_s.10.[45].dylib, our gcc links binaries
with *both* /usr/lib/libgcc_s.1.dylib and
${GCC_PREFIX}/lib/libgcc_s.1.dylib, which is certainly a bad thing.

The problem was already reported to the upstream but it caught
seemingly no attention:
http://gcc.gnu.org/ml/gcc-help/2010-07/msg00164.html

diffstat:

 lang/gcc45/distinfo                                     |   3 +-
 lang/gcc45/patches/patch-libgcc_config_t-slibgcc-darwin |  26 +++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletions(-)

diffs (46 lines):

diff -r 6eafa44f77c7 -r 1d3b20e4d951 lang/gcc45/distinfo
--- a/lang/gcc45/distinfo       Thu May 08 10:14:23 2014 +0000
+++ b/lang/gcc45/distinfo       Thu May 08 10:14:46 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2014/05/08 02:03:58 pho Exp $
+$NetBSD: distinfo,v 1.10 2014/05/08 10:14:46 pho Exp $
 
 SHA1 (gcc-4.5.3.tar.bz2) = 73c45dfda5eef6b124be53e56828b5925198cc1b
 RMD160 (gcc-4.5.3.tar.bz2) = d07aa90f2186b4e082dfd5ad5d5188c097fb6247
@@ -15,5 +15,6 @@
 SHA1 (patch-gcc_doc_cppopts.texi) = fba9b651bdef12f9034e75cb43533b50c2c94540
 SHA1 (patch-gcc_doc_generic.texi) = b255fb30f889a415318a29c50ac0510ccece0bc4
 SHA1 (patch-gcc_doc_invoke.texi) = 7418eddc7e4d39fab3da1922ff86965240661fb4
+SHA1 (patch-libgcc_config_t-slibgcc-darwin) = 2ddda2dd979f27c623e47db70c5abb3befdb68c9
 SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h) = e328bc56bbb9c3e0a76c8d98a7c0a7b8b8eda22e
 SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__noninline.h) = 38dd700202d741de1eeee01c44eee6e2e363b9c5
diff -r 6eafa44f77c7 -r 1d3b20e4d951 lang/gcc45/patches/patch-libgcc_config_t-slibgcc-darwin
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/gcc45/patches/patch-libgcc_config_t-slibgcc-darwin   Thu May 08 10:14:46 2014 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-libgcc_config_t-slibgcc-darwin,v 1.1 2014/05/08 10:14:46 pho Exp $
+
+If we don't install libgcc_s.10.[45].dylib, our gcc links binaries
+with *both* /usr/lib/libgcc_s.1.dylib and
+${GCC_PREFIX}/lib/libgcc_s.1.dylib, which is certainly a bad thing.
+
+The problem was already reported to the upstream but it caught
+seemingly no attention:
+http://gcc.gnu.org/ml/gcc-help/2010-07/msg00164.html
+
+--- libgcc/config/t-slibgcc-darwin.orig        2010-02-02 08:18:48.000000000 +0000
++++ libgcc/config/t-slibgcc-darwin
+@@ -26,13 +26,7 @@ SHLIB_MKMAP = $(gcc_srcdir)/mkmap-flat.a
+ SHLIB_MKMAP_OPTS = -v leading_underscore=1
+ SHLIB_MAPFILES += $(gcc_srcdir)/libgcc-std.ver $(gcc_srcdir)/libgcc-libsystem.ver
+ 
+-# we're only going to build the stubs if the target slib is /usr/lib
+-# there is no other case in which they're useful in a live system.
+-ifeq (/usr/lib,$(shlib_slibdir))
+ LGCC_STUBS = libgcc_s.10.4.dylib libgcc_s.10.5.dylib
+-else
+-LGCC_STUBS =
+-endif
+ 
+ LGCC_FILES = libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)
+ LGCC_FILES += $(LGCC_STUBS)