diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-20 20:05:58 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-20 20:05:58 -0300 |
commit | 1872d2123d241e0a3ef01a50fcdc4596b056bcf4 (patch) | |
tree | a9ba894779ea4dc5df5f6d5a9bceae99f4c44e06 /core/make/PKGBUILD | |
parent | 5a05be089c68617c86c9c555e63f2b0314451ebf (diff) | |
parent | 005a14f92ef5d35e4c47d970cb7e69367a835958 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/balsa/PKGBUILD
community/bitcoin/PKGBUILD
community/jack2/PKGBUILD
community/kadu/PKGBUILD
community/oss/PKGBUILD
core/sudo/PKGBUILD
extra/djvulibre/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/samba/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/glib-networking/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
multilib/jack2-multilib/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-sdl/PKGBUILD
multilib/wine/PKGBUILD
multilib/zsnes/PKGBUILD
testing/btrfs-progs/PKGBUILD
testing/dnsutils/PKGBUILD
testing/man-db/PKGBUILD
testing/postgresql/PKGBUILD
testing/postgresql/postgresql.install
testing/postgresql/postgresql.service
testing/procps-ng/PKGBUILD
testing/procps-ng/sysctl.conf
testing/sudo/PKGBUILD
testing/xf86-video-nouveau/PKGBUILD
testing/xf86-video-nouveau/xf86-video-nouveau.install
Diffstat (limited to 'core/make/PKGBUILD')
-rw-r--r-- | core/make/PKGBUILD | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD index 4106f80fa..cbc6f77c1 100644 --- a/core/make/PKGBUILD +++ b/core/make/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138005 2011-09-14 05:05:13Z allan $ +# $Id: PKGBUILD 166683 2012-09-15 15:22:53Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=make pkgver=3.82 -pkgrel=4 +pkgrel=5 pkgdesc="GNU make utility to maintain groups of programs" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/make" @@ -12,34 +12,44 @@ license=('GPL3') groups=('base-devel') depends=('glibc' 'sh') install=$pkgname.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - bug30612.patch - bug30723.patch +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig} + make-3.82-bug30612.patch + make-3.82-bug30723.patch make-3.82-sort-blank.patch - make-3.82-makeflags.patch) + make-3.82-makeflags.patch + make-3.82-expensive_glob.patch + make-3.82-dont-prune-intermediate.patch) md5sums=('1a11100f3c63fcf5753818e59d63088f' + 'c78daf24f4ec5900c8f81e89a6e1cd5a' 'c8f496b22191f9fb9420ab14c1a19a47' '662e6450e19a5acdaa5c9fcb8ad78dea' '7d01a99f389d8f08dec93ed479071ee4' - 'bc12ad4d0c6e6c0e72d9fb61054f446b') + 'bc12ad4d0c6e6c0e72d9fb61054f446b' + 'e58d4211c5b29d7d927a304d082849e7' + '45ac9e987f4bf16c0d7e1685db943917') build() { cd ${srcdir}/${pkgname}-${pkgver} # http://savannah.gnu.org/bugs/?30612 - patch -Np1 -i $srcdir/bug30612.patch + patch -Np1 -i $srcdir/make-3.82-bug30612.patch # http://savannah.gnu.org/bugs/?30723 - patch -Np1 -i $srcdir/bug30723.patch + patch -Np1 -i $srcdir/make-3.82-bug30723.patch # 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 + # http://lists.gnu.org/archive/html/bug-make/2011-04/msg00002.html + patch -Np0 -i $srcdir/make-3.82-expensive_glob.patch + + # https://savannah.gnu.org/bugs/?30653 + patch -Np0 -i $srcdir/make-3.82-dont-prune-intermediate.patch + ./configure --prefix=/usr make } |