[libtool] libtool: rebase back to 2.4.4
Pavel Raiskup
praiskup at fedoraproject.org
Tue Feb 17 13:09:27 UTC 2015
commit 1421f339b71ac3b739c91253360ff7be1a7b8a15
Author: Pavel Raiskup <praiskup at redhat.com>
Date: Thu Jan 15 12:46:35 2015 +0100
libtool: rebase back to 2.4.4
This reverts commit 1945f9971137e1c88aacca85e6168378ea8ed24f.
Version: 2.4.4-1
Resolves: #1159497
.gitignore | 4 +-
libtool-1.5.22-anygcc.patch | 44 ----------------
libtool-2.2.6-echo.patch | 12 -----
libtool-2.4.2-TEMPORARY-disable-gcj-tests.patch | 13 -----
libtool-2.4.2-powerpcle-linux.patch | 37 --------------
libtool-2.4.2-tar-no-owner.patch | 30 -----------
...2.2.10-rpath.patch => libtool-2.4.3-rpath.patch | 22 ++++++--
...ol-2.4.4-race-in-aclocal-autoheader-calls.patch | 33 ++++++++++++
libtool.spec | 53 ++++++++------------
sources | 2 +-
10 files changed, 73 insertions(+), 177 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b431317..b28f873 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-libtool-2.2.10.tar.lzma
-/libtool-2.4.tar.xz
-/libtool-2.4.2.tar.xz
+/libtool-2.4.4.tar.xz
diff --git a/libtool-2.2.10-rpath.patch b/libtool-2.4.3-rpath.patch
similarity index 61%
rename from libtool-2.2.10-rpath.patch
rename to libtool-2.4.3-rpath.patch
index d0d6d82..30dd5f9 100644
--- a/libtool-2.2.10-rpath.patch
+++ b/libtool-2.4.3-rpath.patch
@@ -1,7 +1,17 @@
-diff -urN libtool-2.2.10/libltdl/m4/libtool.m4 libtool-2.2.10_new/libltdl/m4/libtool.m4
---- libtool-2.2.10/libltdl/m4/libtool.m4 2010-05-20 23:22:02.000000000 +0200
-+++ libtool-2.2.10_new/libltdl/m4/libtool.m4 2010-06-24 11:18:06.000000000 +0200
-@@ -2474,10 +2474,14 @@
+From 78f1c485fa9833c2b02f0bb5b1a630ee67251a01 Mon Sep 17 00:00:00 2001
+From: Karsten Hopp <karsten at fedoraproject.org>
+Date: Wed, 29 Oct 2014 13:27:27 +0100
+Subject: [PATCH] remove /lib64 and /usr/lib64 rpath
+
+---
+ m4/libtool.m4 | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/m4/libtool.m4 b/m4/libtool.m4
+index 068f0d8..bb87360 100644
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -2739,10 +2739,13 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
# before this can be enabled.
hardcode_into_libs=yes
@@ -13,7 +23,9 @@ diff -urN libtool-2.2.10/libltdl/m4/libtool.m4 libtool-2.2.10_new/libltdl/m4/lib
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
+--
+1.9.3
+
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 at 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/libtool.spec b/libtool.spec
index 805dfa3..894a19a 100644
--- a/libtool.spec
+++ b/libtool.spec
@@ -1,10 +1,12 @@
# See the bug #429880
%global gcc_version %(gcc -dumpversion || echo "666")
+%{!?runselftest:%global runselftest 1}
+
Summary: The GNU Portable Library Tool
Name: libtool
-Version: 2.4.2
-Release: 32%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
License: GPLv2+ and LGPLv2+ and GFDL
URL: http://www.gnu.org/software/libtool/
Group: Development/Tools
@@ -12,22 +14,12 @@ Group: Development/Tools
Source: http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz
# ~> downstream
-Patch0: libtool-2.2.10-rpath.patch
-
-# Disable buggy tests for features we don't support.
-# ~> downstream
-Patch1: libtool-2.4.2-TEMPORARY-disable-gcj-tests.patch
-
-# Run the 'tar --no-same-owner -xf' instead of 'tar -xf'
-# ~> #740079
-# ~> Downstream - tar is not used in upstream 'master' branch anymore, will be
-# fixed in next release.
-Patch2: libtool-2.4.2-tar-no-owner.patch
+# ~> remove possibly once #1158915 gets fixed somehow
+Patch0: libtool-2.4.3-rpath.patch
-# powerpc*le-linux support
-# ~> upstream
-# ~> `git diff c37bc1a3..8a8dfaec m4/libtool.m4`
-Patch3: libtool-2.4.2-powerpcle-linux.patch
+# ~> downstream (proposed)
+# ~> http://permalink.gmane.org/gmane.comp.gnu.libtool.patches/11808
+Patch1: libtool-2.4.4-race-in-aclocal-autoheader-calls.patch
# /usr/bin/libtool includes paths within gcc's versioned directories
# Libtool must be rebuilt whenever a new upstream gcc is built
@@ -95,10 +87,9 @@ Static libraries and header files for development with ltdl.
%prep
%setup -n libtool-%{version} -q
%patch0 -p1 -b .rpath
-%patch1 -p1 -b .temp-disable-gcj-test
-%patch2 -p1 -b .tar-no-same-owner
-%patch3 -p1 -b .ppc-le-support
+%patch1 -p1 -b .racy-testsuite
+autoreconf -v
%build
export CC=gcc
@@ -121,14 +112,11 @@ export CFLAGS="$RPM_OPT_FLAGS -fPIC"
make %{?_smp_mflags}
-for i in ChangeLog.1997 ChangeLog.1998 ChangeLog.1999 ChangeLog.2002; do
- iconv -f ISO_8859-15 -t UTF8 $i > $i.tmp
- mv -f $i.tmp $i
-done
-
%check
-make check VERBOSE=yes
+%if 0%{?runselftest}
+make check VERBOSE=yes || { cat testsuite.log ; false ; }
+%endif
%install
@@ -157,7 +145,6 @@ fi
%files
-%defattr(-,root,root)
%doc AUTHORS COPYING NEWS README THANKS TODO ChangeLog*
%{_infodir}/libtool.info*.gz
%{_mandir}/man1/libtool.1*
@@ -165,20 +152,19 @@ fi
%{_bindir}/libtool
%{_bindir}/libtoolize
%{_datadir}/aclocal/*.m4
-%exclude %{_datadir}/libtool/libltdl
-%{_datadir}/libtool
+%dir %{_datadir}/libtool
+%{_datadir}/libtool/build-aux
%files ltdl
-%defattr(-,root,root)
%doc libltdl/COPYING.LIB
%{_libdir}/libltdl.so.*
%files ltdl-devel
-%defattr(-,root,root)
%doc libltdl/README
-%{_datadir}/libtool/libltdl
+%{_datadir}/libtool
+%exclude %{_datadir}/libtool/build-aux
%{_includedir}/ltdl.h
%{_includedir}/libltdl
# .so files without version must be in -devel subpackage
@@ -186,6 +172,9 @@ fi
%changelog
+* Tue Feb 17 2015 Pavel Raiskup <praiskup at redhat.com> - 2.4.4-1
+- rebase again to 2.4.4
+
* Fri Feb 06 2015 Jakub Jelinek <jakub at redhat.com> - 2.4.2-32
- rebuilt for gcc 5.0.0
diff --git a/sources b/sources
index 095ac67..e68617b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2ec8997e0c07249eb4cbd072417d70fe libtool-2.4.2.tar.xz
+51bf400de3354687d68dfa2392506b7e libtool-2.4.4.tar.xz
More information about the scm-commits
mailing list