Fix from Takashi YOSHII to respect LDFLAGS_FOR_BUILD #211947.

Package-Manager: portage-2.2_pre2

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index a9dcc084d7fb959919ea994e8ad80cdd9dbf9970..57ff4bee0bc2a07b82f2ee9753f8944f7b387cca 100644 (file)
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.166 2008/01/02 16:36:27 spb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.167 2008/03/01 20:38:04 vapier Exp $
+
+  01 Mar 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/bash-3.2-ldflags-for-build.patch, bash-3.2_p33.ebuild:
+  Fix from Takashi YOSHII to respect LDFLAGS_FOR_BUILD #211947.
 
   02 Jan 2008; Stephen Bennett <spb@gentoo.org> bash-3.2_p25.ebuild,
   bash-3.2_p33.ebuild:

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index fd7996bf8a08170dc1966eae5067af585dae0ff3..7ea485714aa280af40c869286d57e692da4a2642 100644 (file)
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -46,6 +46,7 @@ AUX bash-3.1-fix-dash-login-shell.patch 1749 RMD160 abb7d3c97dbe8afeaca1d0613c28
 AUX bash-3.1-gentoo.patch 2005 RMD160 e742be7d88ec20bdf7fb7bca415abb8ab46acde2 SHA1 8d9164b1996fd873fe122322759e4143cab0bd8e SHA256 7cd63a3e66de5f885824e6c02c29f004e08eb5bd6b6c189bc8021c5893aeae3f
 AUX bash-3.1-ulimit.patch 3736 RMD160 c68da557d0797c6e6a1b41ba1a6451011ae00a44 SHA1 3e4411090a271ba70becbc34247e9b4c64ddcf76 SHA256 e27d41117dab8814e3812833d2038ca4f5d5fde8a0da2322eb3111a6a6245443
 AUX bash-3.2-dev-fd-test-as-user.patch 1104 RMD160 9701347bb8a0cbd0a98fdcd461f2e87e88afa67b SHA1 04a70b6dcbdc8c2896ee6a7f4a6f0915f10b737e SHA256 f1c8ea4628a85e094f12cf88bc2436fc748cc1c67f2204fdbca222b46a30e858
+AUX bash-3.2-ldflags-for-build.patch 1172 RMD160 b481ef7f6cea6145d49bacd4461b7d886155d0fd SHA1 86aa23e1c902d0ef21163680f888da0dda35a579 SHA256 f325df461e7ec87a8450eeb7db7ac9aa897ddf6c248bbce6ef5e6cd82044fc7e
 AUX bash-3.2-loadables.patch 5355 RMD160 4a219e7e354f9ae36b7141d04aa3326d19ce1ab9 SHA1 a5ca7947f23d1ce669c4aba95d032a8aa88386ff SHA256 e081fe84f4d253c5192d260a3e1af76ff7ece45c1739b327f46884a158c70b1a
 AUX bash-3.2-parallel-build.patch 686 RMD160 8518c94958d66a58504cf05b0428c7b3b1229e27 SHA1 08b11ad8a021034593e5de8560a8930cdb0b47af SHA256 0ad808cff4f93abbdb07d9b4bdb7fcdb203fa391395e4d9d2180d6032b4bf06e
 AUX bash-3.2-process-subst.patch 291 RMD160 0d295ebd160fd80d5c07758f992bb0de8c45b6a0 SHA1 1d374cf3f5dac6de77d32db927658ff8943e32fc SHA256 4c04ea6b60f57d6bc6daf85c35d13e24dec5ebac8e1aaf68c0eeaa180e6d2d98
@@ -141,13 +142,13 @@ EBUILD bash-3.0-r13.ebuild 4613 RMD160 7b41e7ead40733f405a3b854b7fa19edd311e78f
 EBUILD bash-3.0-r14.ebuild 4724 RMD160 8c16b1f563c0eb4d2c752141d9575c24c437a398 SHA1 5a5fa3f34c5f1cc1a3366e687c0a34f85055c652 SHA256 a61469d19238c1ae8909bbeaf7cdd07458013b7e9acea10fe8294664e38eb28f
 EBUILD bash-3.1_p17.ebuild 4601 RMD160 7d674942ae8ebcb662faa45a9efacb236bd6202e SHA1 c00fd85917ace93b4d1bdaf6db18224e08260834 SHA256 ff12913c0306b1b597fb7da13740af52c2ccd65125695914fcf84cac455681a8
 EBUILD bash-3.2_p17-r1.ebuild 5190 RMD160 9c45f94ce82653ca2d45a322f589ff559c38e6ee SHA1 263691afc042bf469ab864fdf4d78ecfca2ce444 SHA256 339157453d9df410d882e72ea22eac12e62ee176ef013e7570135a3c1b959eab
-EBUILD bash-3.2_p33.ebuild 5599 RMD160 8934be7f21b080e52a835895e6a2b11b532fab2f SHA1 79d652f04bf3d585be78ff3aec3f3cebf5859d70 SHA256 6b3306acded34e59028dce8d412762130f26e735169cae9940331f077b6b5668
-MISC ChangeLog 27294 RMD160 5d1d3c5a0ecfd04952158fcbb6daa43a90f5e0f0 SHA1 76bf0a12498894d898c8e1fa4ba127d50d35c65a SHA256 e5a1fca89b03de0f7ec8169d4381ec8d21b4c630e5267c74ffea918464b168bd
+EBUILD bash-3.2_p33.ebuild 5664 RMD160 0c90458576b4a9d94de0ef11790e77066bc92cc4 SHA1 1decf2eb857a9b196a797595c23c6ae240646cf0 SHA256 789d170da22a3d6fd63359c939bc8595996e3cd16dd218b0d6e0e7993f859dff
+MISC ChangeLog 27476 RMD160 40792e96011d1c62ec9e01663a276248a8983b8b SHA1 006361040fed03ddc3ee3f2ec39a7f39f31e4071 SHA256 7e5c5651090a843843fece496d2e2c209c3424f6c19e49f07a6a6d21e03c8004
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHrg5vj9hvisErhMIRAiz0AJ9RrzZo0wV22jRlTNIOC1svVx/6twCg3CX1
-eBdA+ityzrklNSxMZk8f460=
-=FGsr
+iD8DBQFHyb6yj9hvisErhMIRAmx8AKCl1SE7277xLyV+yZSAF6OOTvKpjgCg6DhE
+6/mazQaiS/mDZ6iiY7UN8EY=
+=7yKj
 -----END PGP SIGNATURE-----

diff --git a/app-shells/bash/bash-3.2_p33.ebuild b/app-shells/bash/bash-3.2_p33.ebuild
index 0d37d6953d3dbc03a765da78ef8cd4fefd8112d3..47df002776c4aaf183b05b1fcd9ea815b349bea8 100644 (file)
--- a/app-shells/bash/bash-3.2_p33.ebuild
+++ b/app-shells/bash/bash-3.2_p33.ebuild
@@ -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/app-shells/bash/bash-3.2_p33.ebuild,v 1.4 2008/01/02 17:51:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p33.ebuild,v 1.5 2008/03/01 20:38:04 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -68,6 +68,7 @@ src_unpack() {
                epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch
                epatch "${FILESDIR}"/${PN}-3.2-loadables.patch
                epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671
+               epatch "${FILESDIR}"/${PN}-3.2-ldflags-for-build.patch #211947
 
                # Fix process substitution on BSD.
                epatch "${FILESDIR}"/${PN}-3.2-process-subst.patch

diff --git a/app-shells/bash/files/bash-3.2-ldflags-for-build.patch b/app-shells/bash/files/bash-3.2-ldflags-for-build.patch
new file mode 100644 (file)
index 0000000..2dc1dd6
--- /dev/null
+++ b/app-shells/bash/files/bash-3.2-ldflags-for-build.patch
@@ -0,0 +1,37 @@
+http://bugs.gentoo.org/211947
+
+fix from Takashi YOSHII: dont use target ldflags for build apps
+
+--- bash/builtins/Makefile.in
++++ bash/builtins/Makefile.in
+@@ -63,7 +63,7 @@
+ 
+ LIBS = @LIBS@
+ LDFLAGS = @LDFLAGS@ $(LOCAL_LDFLAGS) $(CFLAGS)
+-LDFLAGS_FOR_BUILD = $(LDFLAGS)
++LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ $(LOCAL_LDFLAGS) $(CFLAGS_FOR_BUILD)
+ LOCAL_LDFLAGS = @LOCAL_LDFLAGS@
+ #LIBS_FOR_BUILD = @LIBS_FOR_BUILD@
+ LIBS_FOR_BUILD = $(LIBS)
+--- bash/support/Makefile.in
++++ bash/support/Makefile.in
+@@ -58,7 +58,7 @@
+ 
+ LOCAL_LDFLAGS = @LOCAL_LDFLAGS@
+ LDFLAGS = @LDFLAGS@ $(LOCAL_LDFLAGS) $(CFLAGS)
+-LDFLAGS_FOR_BUILD = $(LDFLAGS)
++LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ $(LOCAL_LDFLAGS) $(CFLAGS_FOR_BUILD)
+ 
+ INCLUDES = -I${BUILD_DIR} -I${topdir}
+ 
+--- bash/Makefile.in
++++ bash/Makefile.in
+@@ -143,7 +143,7 @@
+ CCFLAGS_FOR_BUILD = $(BASE_CCFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
+ 
+ LDFLAGS = @LDFLAGS@ $(STATIC_LD) $(LOCAL_LDFLAGS) $(PROFILE_FLAGS) $(CFLAGS)
+-LDFLAGS_FOR_BUILD = $(LDFLAGS)
++LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ $(LOCAL_LDFLAGS) $(CFLAGS_FOR_BUILD)
+ 
+ INCLUDES = -I. @RL_INCLUDE@ -I$(srcdir) -I$(BASHINCDIR) -I$(LIBSRC) $(INTL_INC)
+