|
@@ -1,12 +1,12 @@
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
|
|
|
|
-%define gcc_version 11.2.1
|
|
|
|
|
|
+%define gcc_version 12.2.1
|
|
|
|
|
|
Summary: The GNU Portable Library Tool
|
|
Summary: The GNU Portable Library Tool
|
|
Summary(ja): GNU ポータブルライブラリツール
|
|
Summary(ja): GNU ポータブルライブラリツール
|
|
Name: libtool
|
|
Name: libtool
|
|
-Version: 2.4.6
|
|
|
|
-Release: 9%{?_dist_release}
|
|
|
|
|
|
+Version: 2.4.7
|
|
|
|
+Release: 1%{?_dist_release}
|
|
Group: programming
|
|
Group: programming
|
|
Vendor: Project Vine
|
|
Vendor: Project Vine
|
|
Distribution: Vine Linux
|
|
Distribution: Vine Linux
|
|
@@ -14,27 +14,32 @@ Distribution: Vine Linux
|
|
License: GPLv2+ and LGPLv2+ and GFDL
|
|
License: GPLv2+ and LGPLv2+ and GFDL
|
|
URL: http://www.gnu.org/software/libtool/
|
|
URL: http://www.gnu.org/software/libtool/
|
|
Source: http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz
|
|
Source: http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz
|
|
-Patch0: libtool-2.4.6-rpath.patch
|
|
|
|
|
|
|
|
-# ~> downstream (TODO)
|
|
|
|
-Patch1: libtool-2.4.6-am-1.16-test.patch
|
|
|
|
-
|
|
|
|
-# ~> upstream 702a97fbb
|
|
|
|
-Patch2: libtool-2.4.6-specs.patch
|
|
|
|
|
|
+# ~> downstream
|
|
|
|
+# ~> remove possibly once #1158915 gets fixed somehow
|
|
|
|
+Patch0: libtool-2.4.5-rpath.patch
|
|
|
|
|
|
# See the rhbz#1289759 and rhbz#1214506. We disable hardening namely because
|
|
# See the rhbz#1289759 and rhbz#1214506. We disable hardening namely because
|
|
# that bakes the CFLAGS/LDFLAGS into installed /bin/libtool and ltmain.sh files.
|
|
# that bakes the CFLAGS/LDFLAGS into installed /bin/libtool and ltmain.sh files.
|
|
-
|
|
|
|
# At the same time we want to have libltdl.so hardened. Downstream-only patch.
|
|
# At the same time we want to have libltdl.so hardened. Downstream-only patch.
|
|
%undefine _hardened_build
|
|
%undefine _hardened_build
|
|
-Patch3: libtool-2.4.6-hardening.patch
|
|
|
|
-
|
|
|
|
-# rhbz#1622611, upstream 350082b6aa89f9ef603fcebbb4cf33f15a743f2f
|
|
|
|
-Patch4: libtool-2.4.6-fatal-handler.patch
|
|
|
|
|
|
+Patch1: libtool-2.4.6-hardening.patch
|
|
|
|
+
|
|
|
|
+# The testsuite seems to not properly handle template instantiation and as
|
|
|
|
+# a result fails. libtool itself appears to be OK from my by-hand testing. (by Jeff Law)
|
|
|
|
+# Disable LTO for link-order2 test (Related: #1988112)
|
|
|
|
+Patch2: libtool-2.4.6-disable-lto-link-order2.patch
|
|
|
|
+# non-PIC libraries are not supported on ARMv7
|
|
|
|
+# Since we removed "-fPIC" from global CFLAGS this test fails on this arch (as expected)
|
|
|
|
+# Please refer to the following ticket regarding PIC support on ARM:
|
|
|
|
+# https://bugs.launchpad.net/ubuntu/+source/gcc-4.4/+bug/503448
|
|
|
|
+Patch3: libtool-2.4.6-disable_non-pic_arm.patch
|
|
|
|
+
|
|
|
|
+# rhbz#2047389, patch sent upstream
|
|
|
|
+# https://lists.gnu.org/archive/html/libtool-patches/2022-02/msg00000.html
|
|
|
|
+Patch4: libtool-2.4.6-keep-compiler-deps.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
-Requires(post): /sbin/install-info
|
|
|
|
-Requires(preun): /sbin/install-info
|
|
|
|
|
|
|
|
BuildRequires: autoconf >= 2.59, automake >= 1.9.2, texinfo, help2man
|
|
BuildRequires: autoconf >= 2.59, automake >= 1.9.2, texinfo, help2man
|
|
Requires: autoconf >= 2.58, automake >= 1.4
|
|
Requires: autoconf >= 2.58, automake >= 1.4
|
|
@@ -141,25 +146,18 @@ Static libraries and header files for development with ltdl.
|
|
|
|
|
|
|
|
|
|
%prep
|
|
%prep
|
|
-%setup -q
|
|
|
|
-%patch0 -p1
|
|
|
|
-%patch1 -p1
|
|
|
|
-%patch2 -p1
|
|
|
|
-%patch3 -p1
|
|
|
|
-%patch4 -p1
|
|
|
|
|
|
+%autosetup -p1
|
|
|
|
+
|
|
|
|
+autoreconf -v
|
|
|
|
|
|
|
|
|
|
%build
|
|
%build
|
|
-autoreconf -v
|
|
|
|
|
|
|
|
-export CC=gcc
|
|
|
|
-export CXX=g++
|
|
|
|
-export F77=gfortran
|
|
|
|
-export CFLAGS="$RPM_OPT_FLAGS -fPIC"
|
|
|
|
-# dumb redhat-rpm-config replaces config.{sub,guess} with ancient ones in %%configure, use ./configure instead:
|
|
|
|
-./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --mandir=%{_mandir} --infodir=%{_infodir}
|
|
|
|
-# build not smp safe:
|
|
|
|
-make #%{?_smp_mflags}
|
|
|
|
|
|
+%configure
|
|
|
|
+
|
|
|
|
+%make_build \
|
|
|
|
+ CUSTOM_LTDL_CFLAGS="%{?_hardening_cflags}" \
|
|
|
|
+ CUSTOM_LTDL_LDFLAGS="%{?_hardening_ldflags}"
|
|
|
|
|
|
|
|
|
|
#check
|
|
#check
|
|
@@ -177,15 +175,6 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la}
|
|
rm -rf %{buildroot}
|
|
rm -rf %{buildroot}
|
|
|
|
|
|
|
|
|
|
-%post
|
|
|
|
-/sbin/install-info %{_infodir}/libtool.info.gz %{_infodir}/dir || :
|
|
|
|
-
|
|
|
|
-%preun
|
|
|
|
-if [ "$1" = 0 ]; then
|
|
|
|
- /sbin/install-info --delete %{_infodir}/libtool.info.gz %{_infodir}/dir || :
|
|
|
|
-fi
|
|
|
|
-
|
|
|
|
-
|
|
|
|
%files
|
|
%files
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
%license COPYING
|
|
%license COPYING
|
|
@@ -223,6 +212,10 @@ fi
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sat Sep 10 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.7-1
|
|
|
|
+- new upstream release.
|
|
|
|
+- dropped install-info scriptltes.
|
|
|
|
+
|
|
* Thu Aug 05 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.6-9
|
|
* Thu Aug 05 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.6-9
|
|
- rebuilt with gcc-11.2.1.
|
|
- rebuilt with gcc-11.2.1.
|
|
|
|
|