Change LD_AS_NEEDED which got rejected by binutils upstream to plain LDFLAGS based...

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 95e4f58067329ee0f7e354d07f9ce08536fd9b5b..73dca18de6004606814073057d1e3e32196c6fb0 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,16 @@
 # ChangeLog for profile directory
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4392 2010/07/11 14:07:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4393 2010/07/11 19:50:08 ssuominen Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  default/linux/make.defaults, targets/developer/make.defaults:
+  Change LD_AS_NEEDED which got rejected by binutils upstream to plain
+  LDFLAGS based -Wl,--as-needed wrt #327753 by Ryan Hill.
+
   11 Jul 2010; Pacho Ramos <pacho@gentoo.org> arch/hppa/ChangeLog,
   arch/hppa/package.use.mask:
   Mask gnome USE flag for net-voip/ekiga due bug 324511

diff --git a/profiles/default/linux/make.defaults b/profiles/default/linux/make.defaults
index 6a717f188c2e3fdf599fc48f48b0d2992296417f..b052b2e4215869a68fb27c362d0d7dec2556777e 100644 (file)
--- a/profiles/default/linux/make.defaults
+++ b/profiles/default/linux/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/make.defaults,v 1.4 2009/10/31 15:42:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/make.defaults,v 1.5 2010/07/11 19:50:08 ssuominen Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -50,7 +50,7 @@ VIDEO_CARDS="dummy fbdev v4l"
 # after discussion on the gentoo-dev ML. As we bang out a clear
 # direction with how LDFLAGS will be set by default, this entry
 # may move.
-LDFLAGS="-Wl,-O1"
+LDFLAGS="-Wl,-O1 ${LDFLAGS}"
 
 # 2009/09/21 Robin H. Johnson <robbat2@gentoo.org>
 # http://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml

diff --git a/profiles/targets/developer/make.defaults b/profiles/targets/developer/make.defaults
index a3a6a25ce2e2c9603a97ff174f3eb4d3456af660..94f0a7f48450bba97c1822dbe02e331a3eeece40 100644 (file)
--- a/profiles/targets/developer/make.defaults
+++ b/profiles/targets/developer/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/developer/make.defaults,v 1.5 2010/07/08 08:18:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/developer/make.defaults,v 1.6 2010/07/11 19:50:08 ssuominen Exp $
 
 FEATURES="collision-protect digest multilib-strict sign splitdebug stricter test test-fail-continue userpriv usersandbox"
 
@@ -11,4 +11,4 @@ USE="-branding"
 I_KNOW_WHAT_I_AM_DOING="yes"
 
 # Enable asneeded for GNU ld.
-LD_AS_NEEDED="1"
+LDFLAGS="-Wl,--as-needed ${LDFLAGS}"