Redo -ldl handling. Be nicer to libc++.

3 files changed, 20 insertions, 8 deletions

diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 73bb31f4303..c1e5b922f11 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2014/05/13 06:41:31 obache Exp $
+# $NetBSD: Makefile,v 1.63 2014/05/27 09:56:10 joerg Exp $
 
 DISTNAME=	binutils-2.24
 PKGREVISION=	3
@@ -118,4 +118,5 @@ post-install:
 	fi
 .endfor
 
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/binutils/distinfo b/devel/binutils/distinfo
index abc585ae383..036c68cc4c2 100644
--- a/devel/binutils/distinfo
+++ b/devel/binutils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2014/05/12 19:10:08 marino Exp $
+$NetBSD: distinfo,v 1.20 2014/05/27 09:56:10 joerg Exp $
 
 SHA1 (binutils-2.24.tar.bz2) = 7ac75404ddb3c4910c7594b51ddfc76d4693debb
 RMD160 (binutils-2.24.tar.bz2) = b4aa3ea5ba9d0d9f817b2cf136e7f911f692af8d
@@ -7,9 +7,10 @@ SHA1 (patch-aa) = 1a127f82c807cbd1ac6fee073c618f3fb48667f6
 SHA1 (patch-bfd_cache.c) = 5f98b965514286c8110516dd665924709708e78c
 SHA1 (patch-configure.ac) = 7bd7b90e57d850705286f2cc6464ecc45e0657c0
 SHA1 (patch-gas_config_tc-i386.c) = 16b04ee6c3c46db375c883b4338bf5d796174458
-SHA1 (patch-gold_Makefile.in) = e65a81557c49a168e6bbd966e37ce1ad4be34d72
+SHA1 (patch-gold_Makefile.in) = ca87f7589025752713127110cbf9738f1080b62a
 SHA1 (patch-gold_options.h) = 3a1f9f59a1ce105f8f8d5a09fe60e0fe673b61a9
 SHA1 (patch-gold_resolve.cc) = 7e6c45cafddc73a4195c4bdacc43102a0fde3c13
+SHA1 (patch-gold_system.h) = 950e1f0d0cce4df9842d3719221f906ff40b5876
 SHA1 (patch-ld_Makefile.am) = 908d0e0e366d08929d27416a3361e1869abd0076
 SHA1 (patch-ld_Makefile.in) = 68eba0b8a12211915a1eb99770011090f5c21ff2
 SHA1 (patch-ld_configure.tgt) = 7809d739e9a681c0ebe3d60f30dc759accdff6b9
diff --git a/devel/binutils/patches/patch-gold_Makefile.in b/devel/binutils/patches/patch-gold_Makefile.in
index 2ec2c065138..0f3c1c06dba 100644
--- a/devel/binutils/patches/patch-gold_Makefile.in
+++ b/devel/binutils/patches/patch-gold_Makefile.in
@@ -1,16 +1,26 @@
-$NetBSD: patch-gold_Makefile.in,v 1.1 2014/05/12 12:50:00 marino Exp $
+$NetBSD: patch-gold_Makefile.in,v 1.2 2014/05/27 09:56:10 joerg Exp $
 
- Only DragonFly had -ldl stubs.  The other BSDs will fail to link libdl
- so this patch removes the -ldl linker flag.
+ Don't bail out on the deprecation warnings for <ext/hash_map>
 
---- gold/Makefile.in.orig	2014-05-12 12:02:19.000000000 +0000
+ Don't use hard-coded -ldl.
+
+--- gold/Makefile.in.orig	2013-11-04 15:33:39.000000000 +0000
 +++ gold/Makefile.in
+@@ -345,7 +345,7 @@ TARGETOBJS = @TARGETOBJS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+-WARN_CXXFLAGS = @WARN_CXXFLAGS@
++WARN_CXXFLAGS = @WARN_CXXFLAGS@ -Wno-deprecated
+ XGETTEXT = @XGETTEXT@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
 @@ -419,7 +419,7 @@ AM_CPPFLAGS = \
  	-DTOOLLIBDIR="\"$(tooldir)/lib\"" @INCINTL@
  
  LIBIBERTY = ../libiberty/libiberty.a
 -@PLUGINS_TRUE@LIBDL = @DLOPEN_LIBS@
-+@PLUGINS_TRUE@LIBDL =
++@PLUGINS_TRUE@LIBDL = ${DL_LDFLAGS}
  @THREADS_TRUE@THREADSLIB = -lpthread
  AM_YFLAGS = -d