diff options
| -rw-r--r-- | abs/core/automake/PKGBUILD | 13 | ||||
| -rw-r--r-- | abs/core/automake/automake-1.12.2-aclocal7-test-fix.diff | 18 |
2 files changed, 5 insertions, 26 deletions
diff --git a/abs/core/automake/PKGBUILD b/abs/core/automake/PKGBUILD index c9bbe1c..20550c6 100644 --- a/abs/core/automake/PKGBUILD +++ b/abs/core/automake/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163495 2012-07-13 12:31:30Z allan $ +# $Id: PKGBUILD 171527 2012-11-18 11:37:53Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=automake -pkgver=1.12.2 +pkgver=1.12.5 pkgrel=1 pkgdesc="A GNU tool for automatically creating Makefiles" arch=('any') @@ -13,15 +13,12 @@ groups=('base-devel') depends=('perl' 'bash') makedepends=('autoconf') install=automake.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} - automake-1.12.2-aclocal7-test-fix.diff) -md5sums=('56c3ab38a5ed8f2b825341b4e007372a' - '09e754ad7198853dc6abe22cc5e6ba4b' - '12280109fc55cfb6197feecfbe7ab513') +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('2bc1aef898712c7e56320f264040972d' + '2b5cf11401c4a6d9ebe8f3a979b626c9') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p2 -i $srcdir/automake-1.12.2-aclocal7-test-fix.diff ./configure --prefix=/usr make } diff --git a/abs/core/automake/automake-1.12.2-aclocal7-test-fix.diff b/abs/core/automake/automake-1.12.2-aclocal7-test-fix.diff deleted file mode 100644 index e1fd4ba..0000000 --- a/abs/core/automake/automake-1.12.2-aclocal7-test-fix.diff +++ /dev/null @@ -1,18 +0,0 @@ -Fix a race condition that causes aclocal7 to fail on fast machines (see the -comment below). - -diff -x config.log -x config.status -ru tmp/automake-1.12.2/t/aclocal7.sh work/automake-1.12.2/t/aclocal7.sh ---- tmp/automake-1.12.2/t/aclocal7.sh 2012-07-08 11:48:25.000000000 +0100 -+++ work/automake-1.12.2/t/aclocal7.sh 2012-07-10 11:58:50.325999591 +0100 -@@ -45,6 +45,11 @@ - $AUTOMAKE --no-force - } - -+# aclocal will rewrite aclocal.m4 unless the input files are all older than the -+# existing aclocal.m4 -- sleep to ensure somedefs.m4 has an older timestamp -+# than the aclocal.m4 that the next aclocal call will generate. -+$sleep -+ - $ACLOCAL -I m4 - AUTOMAKE_after_aclocal - |