[arch-commits] Commit in automake/trunk (2 files)

[Allan McRae]

    Date: Tuesday, July 10, 2012 @ 17:11:45
  Author: allan
Revision: 163208

upgpkg: automake 1.12.2-1

upstream update

Added:
  automake/trunk/automake-1.12.2-aclocal7-test-fix.diff
Modified:
  automake/trunk/PKGBUILD

----------------------------------------+
 PKGBUILD                               |   11 +++++++----
 automake-1.12.2-aclocal7-test-fix.diff |   18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-10 15:48:58 UTC (rev 163207)
+++ PKGBUILD	2012-07-10 21:11:45 UTC (rev 163208)
@@ -3,7 +3,7 @@
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgname=automake
-pkgver=1.12.1
+pkgver=1.12.2
 pkgrel=1
 pkgdesc="A GNU tool for automatically creating Makefiles"
 arch=('any')
@@ -13,12 +13,15 @@
 depends=('perl' 'bash')
 makedepends=('autoconf')
 install=automake.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('036d79de6e443e02aec2be1df2b4f0ac'
-         '3f8f31210a3030ff9146a6696774f5e9')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
+        automake-1.12.2-aclocal7-test-fix.diff)
+md5sums=('56c3ab38a5ed8f2b825341b4e007372a'
+         '09e754ad7198853dc6abe22cc5e6ba4b'
+         '12280109fc55cfb6197feecfbe7ab513')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -p2 -i $srcdir/automake-1.12.2-aclocal7-test-fix.diff
   ./configure --prefix=/usr
   make
 }

Added: automake-1.12.2-aclocal7-test-fix.diff
===================================================================
--- automake-1.12.2-aclocal7-test-fix.diff	                        (rev 0)
+++ automake-1.12.2-aclocal7-test-fix.diff	2012-07-10 21:11:45 UTC (rev 163208)
@@ -0,0 +1,18 @@
+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
+