ftbfs: caused by automake 1.16.1
Version: 2.4.6-23
This commit is contained in:
parent
601fea1c09
commit
20511dec72
35
libtool-2.4.6-am-1.16-test.patch
Normal file
35
libtool-2.4.6-am-1.16-test.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
Ensure that $(LIBLTDL) is built first
|
||||||
|
|
||||||
|
After Automake upstream commit f4e91bfc490d, the list in 'all-am:' is
|
||||||
|
reordered for this test-case (*_LTLIBRARIES is before *_PROGRAMS), which
|
||||||
|
means that linker will fail to link 'old' binary.
|
||||||
|
|
||||||
|
Previously (with automake <= 1.16), it was matter of luck -- it worked if
|
||||||
|
(a) the build was serial (-j1), and/or (b) libtool-ltdl-devel package was
|
||||||
|
installed on the box so ./configure picked the system version of libltdl.
|
||||||
|
|
||||||
|
Users should anyways use system's ltdl, so this has low priority.
|
||||||
|
|
||||||
|
diff --git a/tests/old-ltdl-iface.at b/tests/old-ltdl-iface.at
|
||||||
|
index cee29089..6f9c8001 100644
|
||||||
|
--- a/tests/old-ltdl-iface.at
|
||||||
|
+++ b/tests/old-ltdl-iface.at
|
||||||
|
@@ -62,6 +62,9 @@ MOSTLYCLEANFILES =
|
||||||
|
include ltdl/Makefile.inc
|
||||||
|
bin_PROGRAMS = old
|
||||||
|
old_LDADD = -Lltdl $(LIBLTDL)
|
||||||
|
+# TODO: if --with-included-ltdl was unused this would
|
||||||
|
+# generate useless dependency.
|
||||||
|
+old_DEPENDENCIES = $(LIBLTDL)
|
||||||
|
]])
|
||||||
|
|
||||||
|
AT_DATA([old.c],
|
||||||
|
@@ -131,7 +134,7 @@ LT_AT_CHECK_LIBTOOLIZE([--ltdl=ltdl --nonrecursive --install], 0, [expout], [exp
|
||||||
|
|
||||||
|
AT_CHECK([test -f ltdl/Makefile.inc])
|
||||||
|
|
||||||
|
-LT_AT_BOOTSTRAP([ignore], [-I m4], [], [--add-missing], [--force])
|
||||||
|
+LT_AT_BOOTSTRAP([ignore], [-I m4], [], [--add-missing], [--force], [--with-included-ltdl])
|
||||||
|
|
||||||
|
LT_AT_EXEC_CHECK([./old], 0, [[...]])
|
||||||
|
|
@ -21,6 +21,10 @@ Source: http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz
|
|||||||
# ~> downstream
|
# ~> downstream
|
||||||
# ~> remove possibly once #1158915 gets fixed somehow
|
# ~> remove possibly once #1158915 gets fixed somehow
|
||||||
Patch0: libtool-2.4.5-rpath.patch
|
Patch0: libtool-2.4.5-rpath.patch
|
||||||
|
|
||||||
|
# ~> downstream (TODO)
|
||||||
|
Patch1: libtool-2.4.6-am-1.16-test.patch
|
||||||
|
|
||||||
%if ! 0%{?_module_build}
|
%if ! 0%{?_module_build}
|
||||||
Patch100: libtool-nodocs.patch
|
Patch100: libtool-nodocs.patch
|
||||||
%endif
|
%endif
|
||||||
@ -94,6 +98,7 @@ Static libraries and header files for development with ltdl.
|
|||||||
%prep
|
%prep
|
||||||
%setup -n libtool-%{version} -q
|
%setup -n libtool-%{version} -q
|
||||||
%patch0 -p1 -b .rpath
|
%patch0 -p1 -b .rpath
|
||||||
|
%patch1 -p1 -b .test
|
||||||
%if ! 0%{?_module_build}
|
%if ! 0%{?_module_build}
|
||||||
%patch100 -p1 -b .nodocs
|
%patch100 -p1 -b .nodocs
|
||||||
%endif
|
%endif
|
||||||
@ -188,6 +193,7 @@ fi
|
|||||||
%changelog
|
%changelog
|
||||||
* Mon Mar 26 2018 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-23
|
* Mon Mar 26 2018 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-23
|
||||||
- bake in versioned requirement on automake (rhbz#1193591)
|
- bake in versioned requirement on automake (rhbz#1193591)
|
||||||
|
- fix testsuite FTBFS against automake 1.16.1
|
||||||
|
|
||||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.6-22
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.6-22
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
Loading…
Reference in New Issue
Block a user