[packages/make/make-4.0] - updated to 4.0 - archives-many-objs.patch included upstream - the relevant code for MAKEFLAGS-reex

draenog draenog at pld-linux.org
Thu Oct 24 17:19:57 CEST 2013


commit 3a265b6ea62a4887de661f5b7c48b46f95e846e2
Author: Kacper Kornet <draenog at pld-linux.org>
Date:   Thu Oct 24 16:13:55 2013 +0100

    - updated to 4.0
    - archives-many-objs.patch included upstream
    - the relevant code for MAKEFLAGS-reexec.patch has been removed upstream
      (see 0a81d50d66565fd3e930fadaadc4a5cb9381d840 in upstream repository)

 make-3.82-MAKEFLAGS-reexec.patch | 14 ----------
 make-archives-many-objs.patch    | 60 ----------------------------------------
 make-getcwd.patch                |  6 ++--
 make.spec                        | 10 ++-----
 4 files changed, 6 insertions(+), 84 deletions(-)
---
diff --git a/make.spec b/make.spec
index 2ef733b..c6afa8a 100644
--- a/make.spec
+++ b/make.spec
@@ -8,13 +8,13 @@ Summary(ru.UTF-8):	GNU Make
 Summary(tr.UTF-8):	GNU Make
 Summary(uk.UTF-8):	GNU Make
 Name:		make
-Version:	3.82
-Release:	3
+Version:	4.0
+Release:	0.1
 Epoch:		1
 License:	GPL v3+
 Group:		Development/Building
 Source0:	http://ftp.gnu.org/gnu/make/%{name}-%{version}.tar.bz2
-# Source0-md5:	1a11100f3c63fcf5753818e59d63088f
+# Source0-md5:	571d470a7647b455e3af3f92d79f1c18
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	ab6da7a1ba3bcf9e86e4e3fdecca61a7
 Patch0:		%{name}-info.patch
@@ -23,8 +23,6 @@ Patch1:		%{name}-getcwd.patch
 #Patch2:		%{name}-memory.patch
 # 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
@@ -98,8 +96,6 @@ derleyerek zaman yitirilmesini önler.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch4 -p0
-%patch5 -p0
 
 %build
 %{__gettextize}
diff --git a/make-3.82-MAKEFLAGS-reexec.patch b/make-3.82-MAKEFLAGS-reexec.patch
deleted file mode 100644
index c2c8dc0..0000000
--- a/make-3.82-MAKEFLAGS-reexec.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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/make-archives-many-objs.patch b/make-archives-many-objs.patch
deleted file mode 100644
index abdcd32..0000000
--- a/make-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/make-getcwd.patch b/make-getcwd.patch
index b1da30e..0ddc65a 100644
--- a/make-getcwd.patch
+++ b/make-getcwd.patch
@@ -1,6 +1,6 @@
---- make-3.82/make.h.orig	2010-07-20 15:12:06.000000000 +0200
-+++ make-3.82/make.h	2010-08-07 11:41:27.294816591 +0200
-@@ -471,11 +471,7 @@
+--- make-4.0/makeint.h.orig	2013-10-09 05:22:40.000000000 +0100
++++ make-4.0/makeint.h	2013-10-24 12:33:43.894410273 +0100
+@@ -527,11 +527,7 @@
  
  #endif  /* Not GNU C library or POSIX.  */
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/make.git/commitdiff/3a265b6ea62a4887de661f5b7c48b46f95e846e2



More information about the pld-cvs-commit mailing list