Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (ba424dfd33cdcad1c7290066e2078d1922cf5b4f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (ba424dfd33cdcad1c7290066e2078d1922cf5b4f)
  • Date: Sat, 12 Oct 2013 10:16:16 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

devel/make/DETAILS | 3 --
devel/make/HISTORY | 4 ++
devel/make/PRE_BUILD | 4 --
devel/make/bug30612.patch | 66
----------------------------------------------
devel/make/bug30723.patch | 12 --------
5 files changed, 5 insertions(+), 84 deletions(-)

New commits:
commit ba424dfd33cdcad1c7290066e2078d1922cf5b4f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/make: version 4.0

diff --git a/devel/make/DETAILS b/devel/make/DETAILS
index 3f96222..67047fa 100755
--- a/devel/make/DETAILS
+++ b/devel/make/DETAILS
@@ -1,6 +1,5 @@
SPELL=make
- VERSION=3.82
- PATCHLEVEL=1
+ VERSION=4.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/devel/make/HISTORY b/devel/make/HISTORY
index 83411ca..38bd742 100644
--- a/devel/make/HISTORY
+++ b/devel/make/HISTORY
@@ -1,3 +1,7 @@
+2013-10-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.0
+ * PRE_BUILD, bug30612.patch, bug30723.patch: removed
+
2011-04-11 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added gettext optional dependency

diff --git a/devel/make/PRE_BUILD b/devel/make/PRE_BUILD
deleted file mode 100755
index 699ed94..0000000
--- a/devel/make/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/bug30612.patch &&
-patch -p1 < $SPELL_DIRECTORY/bug30723.patch
diff --git a/devel/make/bug30612.patch b/devel/make/bug30612.patch
deleted file mode 100644
index fb843bc..0000000
--- a/devel/make/bug30612.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c
---- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000
-+++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000
-@@ -1,3 +1,4 @@
-+
- /* Argument parsing and main program of GNU Make.
- Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
- 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-@@ -1138,7 +1139,7 @@
- a macro and some compilers (MSVC) don't like conditionals in macros.
*/
- {
- const char *features = "target-specific order-only second-expansion"
-- " else-if shortest-stem undefine"
-+ " else-if shortest-stem undefine oneshell"
- #ifndef NO_ARCHIVES
- " archives"
- #endif
-diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c
---- make-3.82-orig/read.c 2010-07-13 11:20:42.000000000 +1000
-+++ make-3.82-fix30612//read.c 2010-09-23 23:30:58.018855839 +1000
-@@ -3028,7 +3028,7 @@
- {
- /* 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 @@
- 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,11 @@
- 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/devel/make/bug30723.patch b/devel/make/bug30723.patch
deleted file mode 100644
index 84e7ebe..0000000
--- a/devel/make/bug30723.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c
---- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000
-+++ make-3.82-fix30723//main.c 2010-09-23 23:34:10.932188592 +1000
-@@ -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))



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (ba424dfd33cdcad1c7290066e2078d1922cf5b4f), Florian Franzmann, 10/12/2013

Archive powered by MHonArc 2.6.24.

Top of Page