diff options
author | root <root@rshg047.dnsready.net> | 2011-06-05 22:48:57 +0000 |
---|---|---|
committer | root <root@rshg047.dnsready.net> | 2011-06-05 22:48:57 +0000 |
commit | 3695b5d62c2aef6e82abc95d775a2ebd89bce081 (patch) | |
tree | db3a874c568e5f5ad3dfe651ceda1df63d5f354f /core | |
parent | 80ba845c7cb571644d9dea61b9872c393d128c37 (diff) |
Sun Jun 5 22:48:57 UTC 2011
Diffstat (limited to 'core')
-rw-r--r-- | core/make/PKGBUILD | 33 | ||||
-rw-r--r-- | core/make/bug30612.patch | 66 | ||||
-rw-r--r-- | core/make/bug30723.patch | 12 | ||||
-rw-r--r-- | core/make/make-3.82-sort-blank.patch | 17 | ||||
-rw-r--r-- | core/make/make.install | 2 |
5 files changed, 121 insertions, 9 deletions
diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD index 8ac07413b..bba3253fc 100644 --- a/core/make/PKGBUILD +++ b/core/make/PKGBUILD @@ -1,25 +1,42 @@ -# $Id: PKGBUILD 77792 2010-04-18 03:42:45Z allan $ +# $Id: PKGBUILD 110342 2011-02-18 22:21:30Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=make -pkgver=3.81 -pkgrel=5 +pkgver=3.82 +pkgrel=3 pkgdesc="GNU make utility to maintain groups of programs" arch=('i686' 'x86_64') url="http://www.gnu.org/software/make" -license=('GPL') +license=('GPL3') groups=('base-devel') depends=('glibc' 'sh') install=$pkgname.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('a4e9494ac6dc3f6b0c5ff75c5d52abba') +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + bug30612.patch + bug30723.patch + make-3.82-sort-blank.patch) +md5sums=('1a11100f3c63fcf5753818e59d63088f' + 'c8f496b22191f9fb9420ab14c1a19a47' + '662e6450e19a5acdaa5c9fcb8ad78dea' + '7d01a99f389d8f08dec93ed479071ee4') + build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --mandir=/usr/share/man --infodir=/usr/share/info + + # http://savannah.gnu.org/bugs/?30612 + patch -Np1 -i $srcdir/bug30612.patch + + # http://savannah.gnu.org/bugs/?30723 + patch -Np1 -i $srcdir/bug30723.patch + + # https://bugs.archlinux.org/task/22733 (fix from Fedora) + patch -Np1 -i $srcdir/make-3.82-sort-blank.patch + + ./configure --prefix=/usr make + make check } package() { diff --git a/core/make/bug30612.patch b/core/make/bug30612.patch new file mode 100644 index 000000000..fb843bcd9 --- /dev/null +++ b/core/make/bug30612.patch @@ -0,0 +1,66 @@ +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/core/make/bug30723.patch b/core/make/bug30723.patch new file mode 100644 index 000000000..84e7ebe7a --- /dev/null +++ b/core/make/bug30723.patch @@ -0,0 +1,12 @@ +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)) diff --git a/core/make/make-3.82-sort-blank.patch b/core/make/make-3.82-sort-blank.patch new file mode 100644 index 000000000..2e73f5b7c --- /dev/null +++ b/core/make/make-3.82-sort-blank.patch @@ -0,0 +1,17 @@ +diff -urp make-3.82/function.c make-3.82-pm/function.c +--- make-3.82/function.c 2010-07-13 03:20:39.000000000 +0200 ++++ make-3.82-pm/function.c 2010-10-27 01:43:27.000000000 +0200 +@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c + { + char c = *(t++); + +- if (! isspace ((unsigned char)c)) ++ if (! isblank ((unsigned char)c)) + continue; + + ++wordi; + +- while (isspace ((unsigned char)*t)) ++ while (isblank ((unsigned char)*t)) + ++t; + } diff --git a/core/make/make.install b/core/make/make.install index 0c2da13c3..6cf8b0dc4 100644 --- a/core/make/make.install +++ b/core/make/make.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(make.info make.info-1 make.info-2) post_install() { |