From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R8Whj-0008AO-7c for garchives@archives.gentoo.org; Tue, 27 Sep 2011 12:24:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7CCA21C0D3; Tue, 27 Sep 2011 12:23:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 536FF21C0D3 for ; Tue, 27 Sep 2011 12:23:49 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 741AF1B4025 for ; Tue, 27 Sep 2011 12:23:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CF36480042 for ; Tue, 27 Sep 2011 12:23:47 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: Subject: [gentoo-commits] proj/betagarden:master commit in: sys-devel/make/files/, sys-devel/make/ X-VCS-Repository: proj/betagarden X-VCS-Files: sys-devel/make/files/make-3.82-MAKEFLAGS-reexec.patch sys-devel/make/files/make-3.82-archives-many-objs.patch sys-devel/make/files/make-3.82-color.patch sys-devel/make/files/make-3.82-glob-speedup.patch sys-devel/make/files/make-3.82-memory-corruption.patch sys-devel/make/make-3.82-r3.ebuild X-VCS-Directories: sys-devel/make/files/ sys-devel/make/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: d225100fe64ebf8a4ef6fe073f5edb284c1198a5 Date: Tue, 27 Sep 2011 12:23:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 02aefa61d34850aa3783735c660da795 commit: d225100fe64ebf8a4ef6fe073f5edb284c1198a5 Author: Sebastian Pipping pipping org> AuthorDate: Tue Sep 27 12:22:55 2011 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Tue Sep 27 12:22:58 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/betagarden.gi= t;a=3Dcommit;h=3Dd225100f sys-devel/make: Move to sping overlay (to keep feature patches out of bet= agarden) --- .../make/files/make-3.82-MAKEFLAGS-reexec.patch | 14 -- .../make/files/make-3.82-archives-many-objs.patch | 60 --------- sys-devel/make/files/make-3.82-color.patch | 141 --------------= ------ sys-devel/make/files/make-3.82-glob-speedup.patch | 104 -------------- .../make/files/make-3.82-memory-corruption.patch | 37 ----- sys-devel/make/make-3.82-r3.ebuild | 46 ------- 6 files changed, 0 insertions(+), 402 deletions(-) diff --git a/sys-devel/make/files/make-3.82-MAKEFLAGS-reexec.patch b/sys-= devel/make/files/make-3.82-MAKEFLAGS-reexec.patch deleted file mode 100644 index a2f5965..0000000 --- a/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 =3D define_makeflags (1, 1); - char *p =3D alloca (sizeof ("MAKEFLAGS=3D") + strlen (pv) += 1); - sprintf (p, "MAKEFLAGS=3D%s", pv); -- putenv (p); -+ putenv (allocated_variable_expand (p)); - } -=20 - if (ISDB (DB_BASIC)) diff --git a/sys-devel/make/files/make-3.82-archives-many-objs.patch b/sy= s-devel/make/files/make-3.82-archives-many-objs.patch deleted file mode 100644 index abdcd32..0000000 --- a/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 -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -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 g= roup. - A valid group MUST have ')' as the last character. */ -- const char *e =3D p + nlen; -+ const char *e =3D p; - do - { - e =3D 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; - } -=20 - /* 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 =3D tp; -+ name =3D tmpbuf; -=20 - /* Expand tilde if applicable. */ -- if (tp[0] =3D=3D '~') -+ if (tmpbuf[0] =3D=3D '~') - { -- tildep =3D tilde_expand (tp); -+ tildep =3D tilde_expand (tmpbuf); - if (tildep !=3D 0) - name =3D tildep; - } -@@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned - else - { - /* We got a chain of items. Attach them. */ -- (*newp)->next =3D found; -+ if (*newp) -+ (*newp)->next =3D found; -+ else -+ *newp =3D found; -=20 - /* Find and set the new end. Massage names if necessar= y. */ - while (1) diff --git a/sys-devel/make/files/make-3.82-color.patch b/sys-devel/make/= files/make-3.82-color.patch deleted file mode 100644 index c6dfe63..0000000 --- a/sys-devel/make/files/make-3.82-color.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 9cb97d5705658f31ba3c4fb197d8800e3f77aec0 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Mon, 26 Sep 2011 22:54:04 +0200 -Subject: [PATCH] Colorize make output (v1) - ---- - job.c | 2 +- - main.c | 2 ++ - misc.c | 16 +++++++++------- - remake.c | 45 ++++++++++++++++++++++++++++++++++++++++----- - 4 files changed, 52 insertions(+), 13 deletions(-) - -diff --git a/job.c b/job.c -index aacfb84..37017e0 100644 ---- a/job.c -+++ b/job.c -@@ -1144,7 +1144,7 @@ start_job_command (struct child *child) - appear. */ -=20 - message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silen= t_flag)) -- ? "%s" : (char *) 0, p); -+ ? "\033[1;35m%s\033[0m" : (char *) 0, p); -=20 - /* Tell update_goal_chain that a command has been started on behalf o= f - this target. It is important that this happens here and not in -diff --git a/main.c b/main.c -index c6989e3..5c6528d 100644 ---- a/main.c -+++ b/main.c -@@ -3231,6 +3231,7 @@ log_working_directory (int entering) -=20 - /* Use entire sentences to give the translators a fighting chance. *= / -=20 -+ printf ("\033[0;36m"); - if (makelevel =3D=3D 0) - if (starting_directory =3D=3D 0) - if (entering) -@@ -3259,6 +3260,7 @@ log_working_directory (int entering) - else - printf (_("%s[%u]: Leaving directory `%s'\n"), - program, makelevel, starting_directory); -+ printf ("\033[0m"); -=20 - /* Flush stdout to be sure this comes before any stderr output. */ - fflush (stdout); -diff --git a/misc.c b/misc.c -index 7a6f773..ad31b83 100644 ---- a/misc.c -+++ b/misc.c -@@ -236,16 +236,18 @@ message (prefix, fmt, va_alist) - if (fmt !=3D 0) - { - if (prefix) -- { -- if (makelevel =3D=3D 0) -- printf ("%s: ", program); -- else -- printf ("%s[%u]: ", program, makelevel); -- } -+ { -+ if (makelevel =3D=3D 0) -+ printf ("\033[36m%s: ", program); -+ else -+ printf ("\033[36m%s[%u]: ", program, makelevel); -+ } -+ else -+ printf ("\033[36m"); - VA_START (args, fmt); - VA_PRINTF (stdout, fmt, args); - VA_END (args); -- putchar ('\n'); -+ printf ("\n\033[0m"); - } -=20 - fflush (stdout); -diff --git a/remake.c b/remake.c -index 27d2550..3babb7a 100644 ---- a/remake.c -+++ b/remake.c -@@ -69,6 +69,38 @@ static void remake_file (struct file *file); - static FILE_TIMESTAMP name_mtime (const char *name); - static const char *library_search (const char *lib, FILE_TIMESTAMP *mti= me_ptr); -=20 -+/* -+ * Take string and wrap it by and -+ * The result is malloc'd and has to be free'd. -+ */ -+static char * colorize(const char * begin, const char * text, const cha= r * end) { -+ const char * const jobs[] =3D {begin, text, end}; -+ const size_t job_count =3D sizeof(jobs) / sizeof(char *); -+ size_t job_lens[job_count]; -+ size_t out_len =3D 1; -+ int i =3D 0; -+ -+ /* Count */ -+ for (; i < job_count; i++) { -+ job_lens[i] =3D strlen(jobs[i]); -+ out_len +=3D job_lens[i]; -+ } -+ -+ /* Allocate */ -+ char * const out =3D malloc(out_len); -+ assert(out); -+ -+ /* Concat */ -+ char * walker =3D out; -+ for (i =3D 0; i < job_count; i++) { -+ strcpy(walker, jobs[i]); -+ walker +=3D job_lens[i]; -+ } -+ walker[0] =3D '\0'; -+ -+ return out; -+} -+ - =0C - /* Remake all the goals in the `struct dep' chain GOALS. Return -1 if = nothing - was done, 0 if all goals were updated successfully, or 1 if a goal f= ailed. -@@ -230,11 +262,14 @@ update_goal_chain (struct dep *goals) - && file->update_status =3D=3D 0 && !g->changed - /* Never give a message under -s or -q. */ - && !silent_flag && !question_flag) -- message (1, ((file->phony || file->cmds =3D=3D 0) -- ? _("Nothing to be done for `%s'.") -- : _("`%s' is up to date.")), -- file->name); -- -+ { -+ const char * const text =3D ((file->phony || file->cmds =3D=3D 0) -+ ? _("Nothing to be done for `%s'.") -+ : _("`%s' is up to date.")); -+ char * const colorized =3D colorize("\033[36m", text, "\033[0m"); -+ message (1, colorized, file->name); -+ free (colorized); -+ } - /* This goal is finished. Remove it from the chain. */ - if (lastgoal =3D=3D 0) - goals =3D g->next; ---=20 -1.7.6.1 - diff --git a/sys-devel/make/files/make-3.82-glob-speedup.patch b/sys-deve= l/make/files/make-3.82-glob-speedup.patch deleted file mode 100644 index c826c2c..0000000 --- a/sys-devel/make/files/make-3.82-glob-speedup.patch +++ /dev/null @@ -1,104 +0,0 @@ -change from upstream to speed up by skipping unused globs -https://bugs.gentoo.org/382845 - -http://cvs.savannah.gnu.org/viewvc/make/read.c?root=3Dmake&r1=3D1.198&r2= =3D1.200 - -Revision 1.200 -Sat May 7 14:36:12 2011 UTC (4 months, 1 week ago) by psmith=20 -Branch: MAIN=20 -Changes since 1.199: +1 -1 lines=20 -Inverted the boolean test from what I wanted it to be. Added a -regression test to make sure this continues to work. - -Revision 1.199 -Mon May 2 00:18:06 2011 UTC (4 months, 2 weeks ago) by psmith=20 -Branch: MAIN=20 -Changes since 1.198: +35 -25 lines=20 -Avoid invoking glob() unless the filename has potential globbing -characters in it, for performance improvements. - ---- a/read.c 2011/04/29 15:27:39 1.198 -+++ b/read.c 2011/05/07 14:36:12 1.200 -@@ -2901,6 +2901,7 @@ - const char *name; - const char **nlist =3D 0; - char *tildep =3D 0; -+ int globme =3D 1; - #ifndef NO_ARCHIVES - char *arname =3D 0; - char *memname =3D 0; -@@ -3109,32 +3110,40 @@ - } - #endif /* !NO_ARCHIVES */ -=20 -- switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl)) -- { -- case GLOB_NOSPACE: -- fatal (NILF, _("virtual memory exhausted")); -- -- case 0: -- /* Success. */ -- i =3D gl.gl_pathc; -- nlist =3D (const char **)gl.gl_pathv; -- break; -- -- case GLOB_NOMATCH: -- /* If we want only existing items, skip this one. */ -- if (flags & PARSEFS_EXISTS) -- { -- i =3D 0; -- break; -- } -- /* FALLTHROUGH */ -- -- default: -- /* By default keep this name. */ -+ /* glob() is expensive: don't call it unless we need to. */ -+ if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") =3D=3D NUL= L) -+ { -+ globme =3D 0; - i =3D 1; - nlist =3D &name; -- break; -- } -+ } -+ else -+ switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl)) -+ { -+ case GLOB_NOSPACE: -+ fatal (NILF, _("virtual memory exhausted")); -+ -+ case 0: -+ /* Success. */ -+ i =3D gl.gl_pathc; -+ nlist =3D (const char **)gl.gl_pathv; -+ break; -+ -+ case GLOB_NOMATCH: -+ /* If we want only existing items, skip this one. */ -+ if (flags & PARSEFS_EXISTS) -+ { -+ i =3D 0; -+ break; -+ } -+ /* FALLTHROUGH */ -+ -+ default: -+ /* By default keep this name. */ -+ i =3D 1; -+ nlist =3D &name; -+ break; -+ } -=20 - /* For each matched element, add it to the list. */ - while (i-- > 0) -@@ -3174,7 +3183,8 @@ - #endif /* !NO_ARCHIVES */ - NEWELT (concat (2, prefix, nlist[i])); -=20 -- globfree (&gl); -+ if (globme) -+ globfree (&gl); -=20 - #ifndef NO_ARCHIVES - if (arname) diff --git a/sys-devel/make/files/make-3.82-memory-corruption.patch b/sys= -devel/make/files/make-3.82-memory-corruption.patch deleted file mode 100644 index b28c073..0000000 --- a/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 =3D argv[0]; - char buf[20]; -=20 -- while (find_next_token (&word_iterator, (unsigned int *) 0) !=3D 0) -+ while (find_next_token (&word_iterator, NULL) !=3D 0) - ++i; -=20 - sprintf (buf, "%d", i); -@@ -1133,21 +1133,14 @@ -=20 - /* Find the maximum number of words we'll have. */ - t =3D argv[0]; -- wordi =3D 1; -- while (*t !=3D '\0') -+ wordi =3D 0; -+ while ((p =3D find_next_token (&t, NULL)) !=3D 0) - { -- char c =3D *(t++); -- -- if (! isspace ((unsigned char)c)) -- continue; -- -+ ++t; - ++wordi; -- -- while (isspace ((unsigned char)*t)) -- ++t; - } -=20 -- words =3D xmalloc (wordi * sizeof (char *)); -+ words =3D xmalloc ((wordi =3D=3D 0 ? 1 : wordi) * sizeof (char *)); -=20 - /* Now assign pointers to each string in the array. */ - t =3D argv[0]; diff --git a/sys-devel/make/make-3.82-r3.ebuild b/sys-devel/make/make-3.8= 2-r3.ebuild deleted file mode 100644 index 905f4ac..0000000 --- a/sys-devel/make/make-3.82-r3.ebuild +++ /dev/null @@ -1,46 +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-r3.ebuild,v = 1.1 2011/09/17 23:29:34 vapier Exp $ - -EAPI=3D"2" - -inherit flag-o-matic eutils - -DESCRIPTION=3D"Standard tool to compile source trees" -HOMEPAGE=3D"http://www.gnu.org/software/make/make.html" -SRC_URI=3D"mirror://gnu//make/${P}.tar.bz2" - -LICENSE=3D"GPL-3" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"nls static" - -DEPEND=3D"nls? ( sys-devel/gettext )" -RDEPEND=3D"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 - epatch "${FILESDIR}"/${P}-glob-speedup.patch #382845 - - epatch "${FILESDIR}"/${P}-color.patch -} - -src_configure() { - use static && append-ldflags -static - econf \ - --program-prefix=3Dg \ - $(use_enable nls) -} - -src_install() { - emake DESTDIR=3D"${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog NEWS README* - if [[ ${USERLAND} =3D=3D "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 -}