diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-07-04 19:48:31 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-07-04 19:48:31 +0200 |
| commit | ee9c1a601c6ce156c295e4a4608ad50535192954 (patch) | |
| tree | 49757b312b758e793ffd8bfedd2d6665cd0b3e29 /core/make | |
| parent | 2690b2e42de85dbcbca602f3299ae4404918e94d (diff) | |
| parent | e9eb2503b10fe4c4aefbee39226c8962d72d58bd (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/calc/PKGBUILD
community/fcitx/PKGBUILD
community/gloobus-preview/PKGBUILD
community/linux-tools/PKGBUILD
community/smc/PKGBUILD
extra/elfutils/PKGBUILD
extra/freenx/PKGBUILD
extra/gnome-alsamixer/PKGBUILD
extra/gvfs/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdesdk-kate/PKGBUILD
extra/lcms2/PKGBUILD
extra/libmspack/PKGBUILD
extra/libtheora/PKGBUILD
extra/mesa/PKGBUILD
extra/nx-common/PKGBUILD
extra/opennx/PKGBUILD
extra/perl-tk/PKGBUILD
extra/qt4/PKGBUILD
extra/soprano/PKGBUILD
extra/wireshark/PKGBUILD
extra/xmlsec/PKGBUILD
extra/xorg-server/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
libre/ipsec-tools-libre/PKGBUILD
libre/tomoyo-tools-libre/PKGBUILD
pcr/amsynth/PKGBUILD
Diffstat (limited to 'core/make')
| -rw-r--r-- | core/make/PKGBUILD | 9 | ||||
| -rw-r--r-- | core/make/make-3.82-bug30612.patch | 27 |
2 files changed, 30 insertions, 6 deletions
diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD index cbc6f77c1..9d6a8660a 100644 --- a/core/make/PKGBUILD +++ b/core/make/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166683 2012-09-15 15:22:53Z allan $ +# $Id: PKGBUILD 189479 2013-07-03 10:09:10Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=make pkgver=3.82 -pkgrel=5 +pkgrel=6 pkgdesc="GNU make utility to maintain groups of programs" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/make" @@ -20,15 +20,14 @@ source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig} make-3.82-expensive_glob.patch make-3.82-dont-prune-intermediate.patch) md5sums=('1a11100f3c63fcf5753818e59d63088f' - 'c78daf24f4ec5900c8f81e89a6e1cd5a' - 'c8f496b22191f9fb9420ab14c1a19a47' + 'SKIP' + '8714ba22911a58ab3eb42ac3f4c6c3bd' '662e6450e19a5acdaa5c9fcb8ad78dea' '7d01a99f389d8f08dec93ed479071ee4' 'bc12ad4d0c6e6c0e72d9fb61054f446b' 'e58d4211c5b29d7d927a304d082849e7' '45ac9e987f4bf16c0d7e1685db943917') - build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/make/make-3.82-bug30612.patch b/core/make/make-3.82-bug30612.patch index fb843bcd9..9867a15b2 100644 --- a/core/make/make-3.82-bug30612.patch +++ b/core/make/make-3.82-bug30612.patch @@ -1,4 +1,3 @@ -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 @@ @@ -64,3 +63,29 @@ diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c /* Find and set the new end. Massage names if necessary. */ while (1) +diff --git make-3.82-orig/read.c make-3.82-fix30612/read.c +index c87d4a7..b012094 100644 +--- make-3.82-orig/read.c ++++ make-3.82-fix30612/read.c +@@ -3044,16 +3044,16 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar, + nlen -= (n + 1) - tp; + tp = n + 1; + +- /* If we have just "lib(", part of something like +- "lib( a b)", go to the next item. */ +- if (! nlen) +- continue; +- + /* We can stop looking now. */ + break; + } + } + while (*e != '\0'); ++ ++ /* If we have just "lib(", part of something like "lib( a b)", ++ go to the next item. */ ++ if (! nlen) ++ continue; + } + } + |