diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-03-01 20:38:04 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-03-01 20:38:04 +0000 |
| commit | 5a7ff17c93917c378ac178c8b2013b6dfcc60c0a (patch) | |
| tree | d0bf321a078645b1f9eb74ea05b3f940240619bd /app-shells/bash | |
| parent | unmask cppserv, as it can now work with apache-2.2 (diff) | |
| download | gentoo-2-5a7ff17c93917c378ac178c8b2013b6dfcc60c0a.tar.gz gentoo-2-5a7ff17c93917c378ac178c8b2013b6dfcc60c0a.tar.bz2 gentoo-2-5a7ff17c93917c378ac178c8b2013b6dfcc60c0a.zip | |
Fix from Takashi YOSHII to respect LDFLAGS_FOR_BUILD #211947.
(Portage version: 2.2_pre2)
Diffstat (limited to 'app-shells/bash')
| -rw-r--r-- | app-shells/bash/ChangeLog | 6 | ||||
| -rw-r--r-- | app-shells/bash/bash-3.2_p33.ebuild | 3 | ||||
| -rw-r--r-- | app-shells/bash/files/bash-3.2-ldflags-for-build.patch | 37 |
3 files changed, 44 insertions, 2 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index a9dcc084d7fb..57ff4bee0bc2 100644 --- 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/bash-3.2_p33.ebuild b/app-shells/bash/bash-3.2_p33.ebuild index 0d37d6953d3d..47df002776c4 100644 --- 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 index 000000000000..2dc1dd6ef790 --- /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) + |