diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-08-10 08:32:49 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-08-10 08:32:49 +0000 |
| commit | cb6eeeb5ecd95419b17a6aa549fdb311bb229d2f (patch) | |
| tree | 1718964f50d5647d73fc573608e42a97c4ddad55 /sys-devel/make | |
| parent | Respect LDFLAGS wrt bug 331801. Thanks to Diego for report. Clean ebuild, add... (diff) | |
| download | gentoo-2-cb6eeeb5ecd95419b17a6aa549fdb311bb229d2f.tar.gz gentoo-2-cb6eeeb5ecd95419b17a6aa549fdb311bb229d2f.tar.bz2 gentoo-2-cb6eeeb5ecd95419b17a6aa549fdb311bb229d2f.zip | |
Add fix from upstream for MAKEFLAGS expansion when re-execing #331975.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel/make')
| -rw-r--r-- | sys-devel/make/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/make/files/make-3.82-MAKEFLAGS-reexec.patch | 14 | ||||
| -rw-r--r-- | sys-devel/make/make-3.82.ebuild | 16 |
3 files changed, 29 insertions, 7 deletions
diff --git a/sys-devel/make/ChangeLog b/sys-devel/make/ChangeLog index 88995765fd3a..fb0f1de9d984 100644 --- a/sys-devel/make/ChangeLog +++ b/sys-devel/make/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/make # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/ChangeLog,v 1.65 2010/08/09 07:06:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/ChangeLog,v 1.66 2010/08/10 08:32:49 vapier Exp $ + + 10 Aug 2010; Mike Frysinger <vapier@gentoo.org> make-3.82.ebuild, + +files/make-3.82-MAKEFLAGS-reexec.patch: + Add fix from upstream for MAKEFLAGS expansion when re-execing #331975. *make-3.82 (09 Aug 2010) diff --git a/sys-devel/make/files/make-3.82-MAKEFLAGS-reexec.patch b/sys-devel/make/files/make-3.82-MAKEFLAGS-reexec.patch new file mode 100644 index 000000000000..c2c8dc012b4c --- /dev/null +++ b/sys-devel/make/files/make-3.82-MAKEFLAGS-reexec.patch @@ -0,0 +1,14 @@ +http://bugs.gentoo.org/331975 +http://bugs.gentoo.org/show_bug.cgi?id=331975 + +--- main.c 2010/07/19 07:10:53 1.243 ++++ main.c 2010/08/10 07:35:34 1.244 +@@ -2093,7 +2093,7 @@ + const char *pv = define_makeflags (1, 1); + char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); + sprintf (p, "MAKEFLAGS=%s", pv); +- putenv (p); ++ putenv (allocated_variable_expand (p)); + } + + if (ISDB (DB_BASIC)) diff --git a/sys-devel/make/make-3.82.ebuild b/sys-devel/make/make-3.82.ebuild index 876845eec28a..297537816f80 100644 --- a/sys-devel/make/make-3.82.ebuild +++ b/sys-devel/make/make-3.82.ebuild @@ -1,8 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.82.ebuild,v 1.1 2010/08/09 07:06:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.82.ebuild,v 1.2 2010/08/10 08:32:49 vapier Exp $ -inherit flag-o-matic +EAPI="2" + +inherit flag-o-matic eutils DESCRIPTION="Standard tool to compile source trees" HOMEPAGE="http://www.gnu.org/software/make/make.html" @@ -16,13 +18,15 @@ IUSE="nls static" DEPEND="nls? ( sys-devel/gettext )" RDEPEND="nls? ( virtual/libintl )" -src_compile() { +src_prepare() { + epatch "${FILESDIR}"/${P}-MAKEFLAGS-reexec.patch #31975 +} + +src_configure() { use static && append-ldflags -static econf \ - $(use_enable nls) \ --program-prefix=g \ - || die - emake || die + $(use_enable nls) } src_install() { |