Stop using ${LDFLAGS} inside LDFLAGS="" because of dev-libs/boost-build and whitespace.

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 73dca18de6004606814073057d1e3e32196c6fb0..33dab198a06538a16ecea726baab07148234ebd7 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.4393 2010/07/11 19:50:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4394 2010/07/12 08:53:07 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!
 
+  12 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  default/linux/make.defaults, targets/developer/make.defaults:
+  Stop using ${LDFLAGS} inside LDFLAGS="" because of dev-libs/boost-build
+  and whitespace.
+
   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

diff --git a/profiles/default/linux/make.defaults b/profiles/default/linux/make.defaults
index b052b2e4215869a68fb27c362d0d7dec2556777e..66f720385a1d070dc8a43c733ebe7da117c5e9f6 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.5 2010/07/11 19:50:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/make.defaults,v 1.6 2010/07/12 08:53:08 ssuominen Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -50,7 +50,10 @@ 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}"
+# 2010/07/12 - Samuli Suominen <ssuominen@gentoo.org>
+# Note that adding LDFLAGS="-Wl,-O1 ${LDFLAGS}" breaks dev-util/boost-build
+# because of whitespace.
+LDFLAGS="-Wl,-O1"
 
 # 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 264c9a24e50c20b052b510f53ee99ae3b86efe74..274bcb177f61159feb428cabd6d4d99a13f00fb2 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.7 2010/07/11 21:19:09 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/developer/make.defaults,v 1.8 2010/07/12 08:53:08 ssuominen Exp $
 
 FEATURES="collision-protect digest multilib-strict sign splitdebug stricter test test-fail-continue userpriv usersandbox"
 
@@ -11,7 +11,7 @@ USE="-branding"
 I_KNOW_WHAT_I_AM_DOING="yes"
 
 # Enable asneeded for GNU ld.
-LDFLAGS="-Wl,--as-needed ${LDFLAGS}"
+LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 
 # Log eqawarn messages
 PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"