summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Raiskup <praiskup@redhat.com>2015-01-14 11:39:59 +0100
committerPavel Raiskup <praiskup@redhat.com>2015-01-14 11:40:51 +0100
commit814b78bc804c033e5f1cf9475de39636af2275a1 (patch)
tree8a6c2d5effd457732bf599292998ddfcfbc4041a
parent6f9ef243b6dfe3a7572718c1c0b7922c27f721c7 (diff)
downloadlibtool-814b78bc804c033e5f1cf9475de39636af2275a1.tar.gz
libtool-814b78bc804c033e5f1cf9475de39636af2275a1.tar.xz
libtool-814b78bc804c033e5f1cf9475de39636af2275a1.zip
rebase: fix sources and commit the testsuite patch
Related: #1159497 Version: 2.4.4-1
-rw-r--r--.gitignore2
-rw-r--r--libtool-2.4.4-race-in-aclocal-autoheader-calls.patch33
-rw-r--r--sources2
3 files changed, 35 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index a1bf638..b28f873 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/libtool-2.4.3.tar.xz
+/libtool-2.4.4.tar.xz
diff --git a/libtool-2.4.4-race-in-aclocal-autoheader-calls.patch b/libtool-2.4.4-race-in-aclocal-autoheader-calls.patch
new file mode 100644
index 0000000..2c658bd
--- /dev/null
+++ b/libtool-2.4.4-race-in-aclocal-autoheader-calls.patch
@@ -0,0 +1,33 @@
+From 2ad0598f0d8cd8c8532a2c34ea1b06c71901047d Mon Sep 17 00:00:00 2001
+From: Pavel Raiskup <praiskup@redhat.com>
+Date: Mon, 15 Dec 2014 13:42:25 +0100
+Subject: [PATCH] tests: fix race in aclocal/autoheader calls
+
+Put the sleep 1 after aclocal run, same as autoreconf does. This
+guarantees that 'aclocal.m4' will have smaller timestamp than
+'config.h.in' and avoids re-running autoheader later on.
+
+* tests/testsuite.at (LT_AT_ACLOCAL): Sleep sec after aclocal run.
+---
+ tests/testsuite.at | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tests/testsuite.at b/tests/testsuite.at
+index 76ed722..2a359a3 100644
+--- a/tests/testsuite.at
++++ b/tests/testsuite.at
+@@ -123,6 +123,11 @@ AT_DATA([acinclude.m4],
+ [m4_define([AC_CONFIG_MACRO_DIRS], m4_defn([AC_CONFIG_MACRO_DIR]))])
+ ]])
+ LT_AT_CHECK([$ACLOCAL $1$macro_dir], [0], [ignore], [ignore])
++# After the 'aclocal' run sleep 1 second to guarantee that aclocal.m4 is going
++# to have older timestamp than other autotools later-generated files (concretely
++# for libtool case, we speak about config.h.in generated autoheader).
++# Autoreconf does the same (after the first aclocal run).
++sleep 1
+ AT_XFAIL_IF([test no = "$ACLOCAL"])
+ AT_KEYWORDS([automake])
+ ])
+--
+1.9.3
+
diff --git a/sources b/sources
index 4185bf3..e68617b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b5699a6d58f5594cdb0992c5e1f5e57e libtool-2.4.3.tar.xz
+51bf400de3354687d68dfa2392506b7e libtool-2.4.4.tar.xz