From 14e0ac1f93afd979244201e59ee6392549bb94f1 Mon Sep 17 00:00:00 2001 From: Sean Paul Date: Mon, 23 Jan 2012 12:24:03 -0800 Subject: [PATCH] Revert "make: import current stable from upstream Gentoo" This reverts commit c770fd9ac4c35af21df7e9837cf7d5f1a306ad1b. We were getting unit test failures (http://build.chromium.org/p/chromiumos/builders/x86%20generic%20full/ builds/1483/steps/UnitTest/logs/stdio), and this CL was identified as the culprit. BUG=chromium-os:25355 TEST=None Change-Id: I66a42ef80e4c7d66021bb59d01cb894d5cd2c1a5 Reviewed-on: https://gerrit.chromium.org/gerrit/14629 Reviewed-by: Mike Frysinger Tested-by: Sean Paul --- .../files/make-3.82-MAKEFLAGS-reexec.patch | 14 ----- .../files/make-3.82-archives-many-objs.patch | 60 ------------------- .../files/make-3.82-memory-corruption.patch | 37 ------------ .../sys-devel/make/make-3.82-r1.ebuild | 43 ------------- 4 files changed, 154 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-MAKEFLAGS-reexec.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-archives-many-objs.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-memory-corruption.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-MAKEFLAGS-reexec.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-MAKEFLAGS-reexec.patch deleted file mode 100644 index a2f59657d4..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-MAKEFLAGS-reexec.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugs.gentoo.org/331975 -https://savannah.gnu.org/bugs/?30723 - ---- 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/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-archives-many-objs.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-archives-many-objs.patch deleted file mode 100644 index abdcd32280..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-archives-many-objs.patch +++ /dev/null @@ -1,60 +0,0 @@ -http://bugs.gentoo.org/334889 -https://savannah.gnu.org/bugs/?30612 - -revision 1.194 -date: 2010-08-13 22:50:14 -0400; author: psmith; state: Exp; lines: +9 -6; commitid: 4UaslPqQHZTs5wKu; -- Fix Savannah bug #30612: handling of archive references with >1 object - -Index: read.c -=================================================================== -RCS file: /sources/make/make/read.c,v -retrieving revision 1.193 -retrieving revision 1.194 -diff -u -p -r1.193 -r1.194 ---- read.c 13 Jul 2010 01:20:42 -0000 1.193 -+++ read.c 14 Aug 2010 02:50:14 -0000 1.194 -@@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned - { - /* This looks like the first element in an open archive group. - A valid group MUST have ')' as the last character. */ -- const char *e = p + nlen; -+ const char *e = p; - do - { - e = next_token (e); -@@ -3084,19 +3084,19 @@ parse_file_seq (char **stringp, unsigned - Go to the next item in the string. */ - if (flags & PARSEFS_NOGLOB) - { -- NEWELT (concat (2, prefix, tp)); -+ NEWELT (concat (2, prefix, tmpbuf)); - continue; - } - - /* If we get here we know we're doing glob expansion. - TP is a string in tmpbuf. NLEN is no longer used. - We may need to do more work: after this NAME will be set. */ -- name = tp; -+ name = tmpbuf; - - /* Expand tilde if applicable. */ -- if (tp[0] == '~') -+ if (tmpbuf[0] == '~') - { -- tildep = tilde_expand (tp); -+ tildep = tilde_expand (tmpbuf); - if (tildep != 0) - name = tildep; - } -@@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned - else - { - /* We got a chain of items. Attach them. */ -- (*newp)->next = found; -+ if (*newp) -+ (*newp)->next = found; -+ else -+ *newp = found; - - /* Find and set the new end. Massage names if necessary. */ - while (1) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-memory-corruption.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-memory-corruption.patch deleted file mode 100644 index b28c07353e..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-memory-corruption.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- function.c 2011/04/18 01:25:20 1.121 -+++ function.c 2011/05/02 12:35:01 1.122 -@@ -706,7 +706,7 @@ - const char *word_iterator = argv[0]; - char buf[20]; - -- while (find_next_token (&word_iterator, (unsigned int *) 0) != 0) -+ while (find_next_token (&word_iterator, NULL) != 0) - ++i; - - sprintf (buf, "%d", i); -@@ -1133,21 +1133,14 @@ - - /* Find the maximum number of words we'll have. */ - t = argv[0]; -- wordi = 1; -- while (*t != '\0') -+ wordi = 0; -+ while ((p = find_next_token (&t, NULL)) != 0) - { -- char c = *(t++); -- -- if (! isspace ((unsigned char)c)) -- continue; -- -+ ++t; - ++wordi; -- -- while (isspace ((unsigned char)*t)) -- ++t; - } - -- words = xmalloc (wordi * sizeof (char *)); -+ words = xmalloc ((wordi == 0 ? 1 : wordi) * sizeof (char *)); - - /* Now assign pointers to each string in the array. */ - t = argv[0]; diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82-r1.ebuild deleted file mode 100644 index e939526484..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.82-r1.ebuild,v 1.1 2011/06/07 13:18:10 chainsaw Exp $ - -EAPI="2" - -inherit flag-o-matic eutils - -DESCRIPTION="Standard tool to compile source trees" -HOMEPAGE="http://www.gnu.org/software/make/make.html" -SRC_URI="mirror://gnu//make/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="nls static" - -DEPEND="nls? ( sys-devel/gettext )" -RDEPEND="nls? ( virtual/libintl )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-archives-many-objs.patch #334889 - epatch "${FILESDIR}"/${P}-MAKEFLAGS-reexec.patch #31975 - epatch "${FILESDIR}"/${P}-memory-corruption.patch #355907 -} - -src_configure() { - use static && append-ldflags -static - econf \ - --program-prefix=g \ - $(use_enable nls) -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog NEWS README* - if [[ ${USERLAND} == "GNU" ]] ; then - # we install everywhere as 'gmake' but on GNU systems, - # symlink 'make' to 'gmake' - dosym gmake /usr/bin/make - dosym gmake.1 /usr/share/man/man1/make.1 - fi -}