diff options
author | root <root@rshg054.dnsready.net> | 2011-09-15 23:14:42 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2011-09-15 23:14:42 +0000 |
commit | 062d1ba2c4d5de52d97f339c5a3ac1199b8533f6 (patch) | |
tree | bd00d2e476e1761b3771b1849a3a207dd8cb5c57 /core/make | |
parent | d5effc9aadfb9ed5890376ca9497eef52fafcf83 (diff) |
Thu Sep 15 23:14:42 UTC 2011
Diffstat (limited to 'core/make')
-rw-r--r-- | core/make/PKGBUILD | 14 | ||||
-rw-r--r-- | core/make/make-3.82-makeflags.patch | 36 |
2 files changed, 46 insertions, 4 deletions
diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD index 2db407582..3f38c53f3 100644 --- a/core/make/PKGBUILD +++ b/core/make/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 129849 2011-06-29 04:28:30Z allan $ +# $Id: PKGBUILD 138005 2011-09-14 05:05:13Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=make pkgver=3.82 -pkgrel=3 +pkgrel=4 pkgdesc="GNU make utility to maintain groups of programs" arch=('i686' 'x86_64') url="http://www.gnu.org/software/make" @@ -15,11 +15,13 @@ install=$pkgname.install source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2 bug30612.patch bug30723.patch - make-3.82-sort-blank.patch) + make-3.82-sort-blank.patch + make-3.82-makeflags.patch) md5sums=('1a11100f3c63fcf5753818e59d63088f' 'c8f496b22191f9fb9420ab14c1a19a47' '662e6450e19a5acdaa5c9fcb8ad78dea' - '7d01a99f389d8f08dec93ed479071ee4') + '7d01a99f389d8f08dec93ed479071ee4' + 'bc12ad4d0c6e6c0e72d9fb61054f446b') build() { @@ -34,6 +36,10 @@ build() { # https://bugs.archlinux.org/task/22733 (fix from Fedora) patch -Np1 -i $srcdir/make-3.82-sort-blank.patch + # https://savannah.gnu.org/support/index.php?107487 + # https://savannah.gnu.org/bugs/?33873 + patch -Np0 -i $srcdir/make-3.82-makeflags.patch + ./configure --prefix=/usr make } diff --git a/core/make/make-3.82-makeflags.patch b/core/make/make-3.82-makeflags.patch new file mode 100644 index 000000000..3cba3c402 --- /dev/null +++ b/core/make/make-3.82-makeflags.patch @@ -0,0 +1,36 @@ +Index: main.c +=================================================================== +RCS file: /sources/make/make/main.c,v +retrieving revision 1.246 +diff -u -r1.246 main.c +--- main.c 29 Aug 2010 23:05:27 -0000 1.246 ++++ main.c 27 Jul 2011 22:03:12 -0000 +@@ -2091,10 +2095,16 @@ + + /* Reset makeflags in case they were changed. */ + { ++ if (master_job_slots) ++ { ++ assert (job_slots == default_job_slots); ++ job_slots = master_job_slots; ++ } + const char *pv = define_makeflags (1, 1); + char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); + sprintf (p, "MAKEFLAGS=%s", pv); + putenv (allocated_variable_expand (p)); ++ job_slots = default_job_slots; + } + + if (ISDB (DB_BASIC)) +@@ -2825,9 +2852,11 @@ + && (*(unsigned int *) cs->value_ptr == + *(unsigned int *) cs->noarg_value)) + ADD_FLAG ("", 0); /* Optional value omitted; see below. */ ++#if 0 + else if (cs->c == 'j') + /* Special case for `-j'. */ + ADD_FLAG ("1", 1); ++#endif + else + { + char *buf = alloca (30); |