packages: make/make.spec, make/make-archives-many-objs.patch (NEW) - added ...

qboosh qboosh at pld-linux.org
Sat Sep 25 08:12:46 CEST 2010


Author: qboosh                       Date: Sat Sep 25 06:12:46 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added archives-many-objs patch from upstream/gentoo (fixes gnu-efi build)
- release 3

---- Files affected:
packages/make:
   make.spec (1.84 -> 1.85) , make-archives-many-objs.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/make/make.spec
diff -u packages/make/make.spec:1.84 packages/make/make.spec:1.85
--- packages/make/make.spec:1.84	Wed Aug 11 07:51:54 2010
+++ packages/make/make.spec	Sat Sep 25 08:12:40 2010
@@ -10,7 +10,7 @@
 Summary(uk.UTF-8):	GNU Make
 Name:		make
 Version:	3.82
-Release:	2
+Release:	3
 Epoch:		1
 License:	GPL v3+
 Group:		Development/Building
@@ -25,6 +25,7 @@
 # needs rewrite for 3.82, but probably nothing serious
 #Patch3:		%{name}-newlines.patch
 Patch4:		%{name}-3.82-MAKEFLAGS-reexec.patch
+Patch5:		%{name}-archives-many-objs.patch
 URL:		http://www.gnu.org/software/make/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
@@ -99,6 +100,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch4 -p0
+%patch5 -p0
 
 %build
 %{__gettextize}
@@ -155,6 +157,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.85  2010/09/25 06:12:40  qboosh
+- added archives-many-objs patch from upstream/gentoo (fixes gnu-efi build)
+- release 3
+
 Revision 1.84  2010/08/11 05:51:54  arekm
 - rel 2; fix glibc make install-headers issue
 

================================================================
Index: packages/make/make-archives-many-objs.patch
diff -u /dev/null packages/make/make-archives-many-objs.patch:1.1
--- /dev/null	Sat Sep 25 08:12:46 2010
+++ packages/make/make-archives-many-objs.patch	Sat Sep 25 08:12:40 2010
@@ -0,0 +1,60 @@
+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)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/make/make.spec?r1=1.84&r2=1.85&f=u



More information about the pld-cvs-commit mailing list