Compare commits

..

3 Commits
rawhide ... f16

Author SHA1 Message Date
Jakub Jelinek 445ee1c3af 2.4-9 2012-03-06 16:00:27 +01:00
Karsten Hopp bda63d8373 fix typo (Bart Van Assche, bugzilla #759376) 2012-02-06 15:50:30 +01:00
Jakub Jelinek 37cfc5f44d rebuilt for gcc 4.6.2 2011-10-27 20:03:50 +02:00
14 changed files with 197 additions and 596 deletions

4
.gitignore vendored
View File

@ -1,2 +1,2 @@
/libtool-2.4.6.tar.xz
/libtool-2.4.7.tar.xz
libtool-2.2.10.tar.lzma
/libtool-2.4.tar.xz

View File

@ -1,6 +0,0 @@
mcd $BUILDDIR/libtool
$SRC/libtool-*/configure $TCONFIGARGS
make $J
make $J install

View File

@ -0,0 +1,44 @@
--- libtool-1.5.22/libtool.m4.anygcc 2005-12-18 22:53:17.000000000 +0100
+++ libtool-1.5.22/libtool.m4 2006-06-29 14:20:18.000000000 +0200
@@ -4294,6 +4294,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -4427,11 +4430,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -4443,7 +4446,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -4523,7 +4526,7 @@
link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec

View File

@ -0,0 +1,19 @@
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 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
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

12
libtool-2.2.6-echo.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up libtool-2.2.6/configure.echo libtool-2.2.6/configure
--- libtool-2.2.6/configure.echo 2008-12-03 09:26:03.000000000 -0500
+++ libtool-2.2.6/configure 2008-12-03 09:26:14.000000000 -0500
@@ -27606,7 +27606,7 @@ objdir=$objdir
SHELL=$lt_SHELL
# An echo program that does not interpret backslashes.
-ECHO=$lt_ECHO
+echo=$lt_ECHO
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD

View File

@ -0,0 +1,33 @@
diff -U0 libtool-2.4/ChangeLog.typo libtool-2.4/ChangeLog
--- libtool-2.4/ChangeLog.typo 2012-02-06 15:46:51.000000000 +0100
+++ libtool-2.4/ChangeLog 2012-02-06 15:46:40.000000000 +0100
@@ -0,0 +1,5 @@
+2011-10-04 Bart Van Assche <bvanassche@acm.org>
+
+ Typo fix - change func_apped into func_append
+ * libltdl/config/ltmain.m4sh: Fix typo.
+
diff -up libtool-2.4/libltdl/config/ltmain.m4sh.typo libtool-2.4/libltdl/config/ltmain.m4sh
--- libtool-2.4/libltdl/config/ltmain.m4sh.typo 2012-02-06 15:47:51.000000000 +0100
+++ libtool-2.4/libltdl/config/ltmain.m4sh 2012-02-06 15:47:58.000000000 +0100
@@ -7261,7 +7261,7 @@ EOF
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) func_apped perm_rpath " $libdir" ;;
+ *) func_append perm_rpath " $libdir" ;;
esac
fi
done
diff -up libtool-2.4/libltdl/config/ltmain.sh.typo libtool-2.4/libltdl/config/ltmain.sh
--- libtool-2.4/libltdl/config/ltmain.sh.typo 2012-02-06 15:47:15.000000000 +0100
+++ libtool-2.4/libltdl/config/ltmain.sh 2012-02-06 15:47:24.000000000 +0100
@@ -8050,7 +8050,7 @@ EOF
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) func_apped perm_rpath " $libdir" ;;
+ *) func_append perm_rpath " $libdir" ;;
esac
fi
done

View File

@ -1,35 +0,0 @@
From f7e477ec085414991c8160c7394bfaf2b1425c67 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@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 f796d7b..41dd20a 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2866,6 +2866,9 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command
@@ -2874,7 +2877,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
# appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
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
--
2.1.0

View File

@ -1,53 +0,0 @@
Enabling lto will result in failure during test phase, to be precise test 67 will cause it.
Compiler flags for this test (and most likely for rest of them) are inherited from actual build phase.
I'm not sure if this is expected.
Most distribution disables this test. We try to keep it by stripping lto flags for it.
Origin for this tests: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=391427
--- a/tests/link-order2.at 2015-01-16 19:52:04.000000000 +0100
+++ b/tests/link-order2_new.at 2021-11-30 02:01:09.574451906 +0100
@@ -47,6 +47,8 @@
AT_KEYWORDS([libtool])
AT_KEYWORDS([interactive])dnl running 'wrong' may cause a popup window.
+NO_LTO_CFLAGS=${CFLAGS/-flto*-ffat-lto-objects }
+
eval `$LIBTOOL --config | $EGREP '^(shlibpath_var|allow_undefined_flag)='`
undefined_setting=-no-undefined
@@ -89,12 +91,12 @@
EOF
for file in a0 a1 b; do
- $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c $file.c
+ $LIBTOOL --mode=compile $CC $CPPFLAGS $NO_LTO_CFLAGS -c $file.c
done
-$CC $CPPFLAGS $CFLAGS -c main.c
+$CC $CPPFLAGS $NO_LTO_CFLAGS -c main.c
# Build an old, installed library.
-$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o liba0.la a0.lo -rpath $deflibdir
+$LIBTOOL --mode=link $CC $NO_LTO_CFLAGS $LDFLAGS $static -o liba0.la a0.lo -rpath $deflibdir
$LIBTOOL --mode=install cp liba0.la $deflibdir/liba0.la
$LIBTOOL --mode=clean rm -f liba0.la
@@ -118,13 +120,13 @@
esac
test non-libtool,-static-libtool-libs = "$type_of_depdepl,$static" &&
static=-all-static
- $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o liba1.la a1.lo -rpath $libdir
- $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o libb.la b.lo liba1.la -rpath $libdir
- AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o main$EXEEXT main.$OBJEXT libb.la -la0],
+ $LIBTOOL --mode=link $CC $NO_LTO_CFLAGS $LDFLAGS $static -o liba1.la a1.lo -rpath $libdir
+ $LIBTOOL --mode=link $CC $NO_LTO_CFLAGS $LDFLAGS $static -o libb.la b.lo liba1.la -rpath $libdir
+ AT_CHECK([$LIBTOOL --mode=link $CC $NO_LTO_CFLAGS $LDFLAGS $static -o main$EXEEXT main.$OBJEXT libb.la -la0],
[], [ignore], [ignore])
LT_AT_EXEC_CHECK([./main])
# Now test that if we reverse the link order, the program fails.
- AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o wrong$EXEEXT main.$OBJEXT -la0 libb.la],
+ AT_CHECK([$LIBTOOL --mode=link $CC $NO_LTO_CFLAGS $LDFLAGS $static -o wrong$EXEEXT main.$OBJEXT -la0 libb.la],
[], [ignore], [ignore])
if test yes, != "$shared_fails,$static"; then
LT_AT_EXEC_CHECK([./wrong], [1], [], [ignore], [|| (exit 1)])

View File

@ -1,16 +0,0 @@
diff -r -U5 libtool-2.4.6.old/tests/demo.at libtool-2.4.6/tests/demo.at
--- libtool-2.4.6.old/tests/demo.at 2022-01-31 22:15:48.539557030 +0100
+++ libtool-2.4.6/tests/demo.at 2022-02-01 09:43:30.262092074 +0100
@@ -508,11 +508,11 @@
## ----------- ##
AT_SETUP([force non-PIC objects])
AT_CHECK([case $host in
-hppa*|x86_64*|s390*)
+hppa*|x86_64*|s390*|arm*)
# These hosts cannot use non-PIC shared libs
exit 77 ;;
*-solaris*|*-sunos*)
# Libtool does not build non-PIC shared libs on these hosts
exit 77 ;;

View File

@ -1,14 +0,0 @@
diff --git a/Makefile.am b/Makefile.am
index 13dfc63..5c5603a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -311,6 +311,9 @@ libtool: $(ltmain_sh) $(config_status) $(dotversion)
include libltdl/ltdl.mk
+libltdl_libltdl_la_CPPFLAGS += $(CUSTOM_LTDL_CFLAGS)
+libltdl_libltdl_la_LDFLAGS += $(CUSTOM_LTDL_LDFLAGS)
+
lt_aclocal_m4 = $(srcdir)/$(ltdl_dir)/aclocal.m4
lt_config_h_in = $(srcdir)/$(ltdl_dir)/config-h.in
lt_configure = $(srcdir)/$(ltdl_dir)/configure

View File

@ -1,58 +0,0 @@
diff -r -U5 libtool-2.4.6/build-aux/ltmain.in libtool-2.4.6.new/build-aux/ltmain.in
--- libtool-2.4.6/build-aux/ltmain.in 2022-02-22 09:21:35.317958251 +0100
+++ libtool-2.4.6.new/build-aux/ltmain.in 2022-02-22 09:16:10.117571787 +0100
@@ -501,21 +501,14 @@
fi
# preserve --debug
test : = "$debug_cmd" || func_append preserve_args " --debug"
- case $host in
- # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
- # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
- *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
- # don't eliminate duplications in $postdeps and $predeps
- opt_duplicate_compiler_generated_deps=:
- ;;
- *)
- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
- ;;
- esac
+ # Keeping compiler generated duplicates in $postdeps and $predeps is not
+ # harmful, and is necessary in a majority of systems that use it to satisfy
+ # symbol dependencies.
+ opt_duplicate_compiler_generated_deps=:
$opt_help || {
# Sanity checks first:
func_check_version_match
diff -r -U5 libtool-2.4.6/build-aux/ltmain.sh libtool-2.4.6.new/build-aux/ltmain.sh
--- libtool-2.4.6/build-aux/ltmain.sh 2015-02-15 17:15:12.000000000 +0100
+++ libtool-2.4.6.new/build-aux/ltmain.sh 2022-02-22 09:16:44.783613061 +0100
@@ -2413,21 +2413,14 @@
fi
# preserve --debug
test : = "$debug_cmd" || func_append preserve_args " --debug"
- case $host in
- # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
- # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
- *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
- # don't eliminate duplications in $postdeps and $predeps
- opt_duplicate_compiler_generated_deps=:
- ;;
- *)
- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
- ;;
- esac
+ # Keeping compiler generated duplicates in $postdeps and $predeps is not
+ # harmful, and is necessary in a majority of systems that use it to satisfy
+ # symbol dependencies.
+ opt_duplicate_compiler_generated_deps=:
$opt_help || {
# Sanity checks first:
func_check_version_match

View File

@ -1,40 +0,0 @@
diff -up libtool-2.4.6/Makefile.in.nodocs libtool-2.4.6/Makefile.in
--- libtool-2.4.6/Makefile.in.nodocs 2017-04-21 12:46:20.704300023 +0200
+++ libtool-2.4.6/Makefile.in 2017-04-21 12:46:42.696840234 +0200
@@ -313,12 +313,11 @@ MAKEINFOHTML = $(MAKEINFO) --html
AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
DVIPS = dvips
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
- ctags-recursive dvi-recursive html-recursive info-recursive \
- install-data-recursive install-dvi-recursive \
- install-exec-recursive install-html-recursive \
- install-info-recursive install-pdf-recursive \
- install-ps-recursive install-recursive installcheck-recursive \
- installdirs-recursive pdf-recursive ps-recursive \
+ ctags-recursive \
+ install-data-recursive \
+ install-exec-recursive \
+ install-recursive installcheck-recursive \
+ installdirs-recursive \
tags-recursive uninstall-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
@@ -361,8 +360,7 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
-am__DIST_COMMON = $(dist_man1_MANS) $(doc_libtool_TEXINFOS) \
- $(srcdir)/Makefile.in $(srcdir)/config-h.in \
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config-h.in \
$(srcdir)/libltdl/ltdl.mk $(top_srcdir)/build-aux/compile \
$(top_srcdir)/build-aux/config.guess \
$(top_srcdir)/build-aux/config.sub \
@@ -1973,7 +1971,7 @@ info: info-recursive
info-am: $(INFO_DEPS)
install-data-am: install-data-local install-includeHEADERS \
- install-info-am install-ltdlincludeHEADERS install-man
+ install-ltdlincludeHEADERS
install-dvi: install-dvi-recursive

View File

@ -1,67 +1,26 @@
# See the bug #429880
%global gcc_major %(gcc -dumpversion || echo "666")
# See rhbz#1193591
%global automake_version %(set -- `automake --version | head -n 1` ; echo ${4-unknown})
%bcond_without check
%define gcc_version 4.6.3
Summary: The GNU Portable Library Tool
Name: libtool
Version: 2.4.7
Release: 2%{?dist}
Version: 2.4
Release: 9%{?dist}
License: GPLv2+ and LGPLv2+ and GFDL
URL: http://www.gnu.org/software/libtool/
Group: Development/Tools
Source: http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz
Patch0: libtool-2.2.10-rpath.patch
Patch1: libtool-2.4-funcappend-759376.patch
URL: http://www.gnu.org/software/libtool/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
# ~> 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
# 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.
%undefine _hardened_build
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
%if ! 0%{?_module_build}
Patch100: libtool-nodocs.patch
%endif
BuildRequires: autoconf >= 2.59, automake >= 1.9.2, texinfo
Requires: autoconf >= 2.58, automake >= 1.4, sed
# make sure we can configure all supported langs
BuildRequires: gcc, gcc-c++, libstdc++-devel, gcc-gfortran, gcc-java
# /usr/bin/libtool includes paths within gcc's versioned directories
# Libtool must be rebuilt whenever a new upstream gcc is built
# Starting with gcc 7 gcc in Fedora is packaged so that only major
# number changes need libtool rebuilding.
Requires: gcc(major) = %{gcc_major}
Requires: autoconf, automake, sed, tar, findutils
%if ! 0%{?_module_build}
BuildRequires: texinfo
%endif
BuildRequires: autoconf, automake
BuildRequires: help2man
# make sure we can configure all supported langs
BuildRequires: libstdc++-devel, gcc-gfortran
BuildRequires: gcc, gcc-c++
BuildRequires: make
Requires: gcc = %{gcc_version}
%description
GNU Libtool is a set of shell scripts which automatically configure UNIX and
@ -73,17 +32,18 @@ If you are developing programs which will use shared libraries, but do not use
the rest of the GNU Autotools (such as GNU Autoconf and GNU Automake), you
should install the libtool package.
The libtool package also includes all files needed to integrate the GNU
The libtool package also includes all files needed to integrate the GNU
Portable Library Tool (libtool) and the GNU Libtool Dynamic Module Loader
(ltdl) into a package built using the GNU Autotools (including GNU Autoconf
and GNU Automake).
%package ltdl
Summary: Runtime libraries for GNU Libtool Dynamic Module Loader
Group: System Environment/Libraries
Provides: %{name}-libs = %{version}-%{release}
License: LGPLv2+
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
%description ltdl
The libtool-ltdl package contains the GNU Libtool Dynamic Module Loader, a
@ -91,356 +51,111 @@ library that provides a consistent, portable interface which simplifies the
process of using dynamic modules.
These runtime libraries are needed by programs that link directly to the
system-installed ltdl libraries; they are not needed by software built using
system-installed ltdl libraries; they are not needed by software built using
the rest of the GNU Autotools (including GNU Autoconf and GNU Automake).
%package ltdl-devel
Summary: Tools needed for development using the GNU Libtool Dynamic Module Loader
Requires: automake = %automake_version
Group: Development/Libraries
Requires: %{name}-ltdl = %{version}-%{release}
License: LGPLv2+
%description ltdl-devel
Static libraries and header files for development with ltdl.
%prep
%autosetup -n libtool-%{version} -p1
autoreconf -v
%prep
%setup -n libtool-%{version} -q
%patch0 -p1 -b .rpath
%patch1 -p1 -b .typo
%build
%configure
%make_build \
CUSTOM_LTDL_CFLAGS="%_hardening_cflags" \
CUSTOM_LTDL_LDFLAGS="%_hardening_ldflags"
./bootstrap
export CC=gcc
export CXX=g++
export F77=gfortran
export CFLAGS="$RPM_OPT_FLAGS -fPIC"
# don't conflict with libtool-1.5, use own directory:
sed -e 's/pkgdatadir="\\${datadir}\/\$PACKAGE"/pkgdatadir="\\${datadir}\/\${PACKAGE}"/' configure > configure.tmp; mv -f configure.tmp configure; chmod a+x configure
./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}
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
%if %{with check}
make check VERBOSE=yes || { cat tests/testsuite.dir/*/testsuite.log ; false ; }
%endif
make check VERBOSE=yes | tee make_check.log 2>&1 # || (cat make_check.log && false)
%install
%make_install
# info's TOP dir (by default owned by info)
rm -rf %{buildroot}
make install DESTDIR=$RPM_BUILD_ROOT
rm -f %{buildroot}%{_infodir}/dir
# *.la *.a files generated by libtool shouldn't be distributed (and the
# `./configure --disable-static' breaks testsuite)
rm -f %{buildroot}%{_libdir}/libltdl.{a,la}
rm -f %{buildroot}%{_libdir}/libltdl.la %{buildroot}%{_libdir}/libltdl.a
%clean
rm -rf %{buildroot}
%post
/sbin/install-info %{_infodir}/libtool.info.gz %{_infodir}/dir || :
%post ltdl -p /sbin/ldconfig
%preun
if [ "$1" = 0 ]; then
/sbin/install-info --delete %{_infodir}/libtool.info.gz %{_infodir}/dir || :
fi
%postun ltdl -p /sbin/ldconfig
%files
%license COPYING
%doc AUTHORS NEWS README THANKS TODO ChangeLog*
%defattr(-,root,root)
%doc AUTHORS COPYING NEWS README THANKS TODO ChangeLog*
%{_infodir}/libtool.info*.gz
%{_mandir}/man1/libtool.1*
%{_mandir}/man1/libtoolize.1*
%{_bindir}/libtool
%{_bindir}/libtoolize
%{_datadir}/aclocal/*.m4
%dir %{_datadir}/libtool
%{_datadir}/libtool/build-aux
%exclude %{_datadir}/libtool/libltdl
%{_datadir}/libtool
%files ltdl
%license libltdl/COPYING.LIB
%defattr(-,root,root)
%doc libltdl/COPYING.LIB
%{_libdir}/libltdl.so.*
%dir %{_datadir}/libtool
%files ltdl-devel
%license libltdl/COPYING.LIB
%defattr(-,root,root)
%doc libltdl/README
%{_datadir}/libtool
%exclude %{_datadir}/libtool/build-aux
%{_datadir}/libtool/libltdl
%{_libdir}/libltdl.so
%{_includedir}/ltdl.h
%{_includedir}/libltdl
# .so files without version must be in -devel subpackage
%{_libdir}/libltdl.so
%changelog
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Mar 06 2012 Jakub Jelinek <jakub@redhat.com> 2.4-9
- rebuilt for gcc 4.6.3
* Mon Mar 21 2022 Frederic Berat <fberat@redhat.com> - 2.4.7-1
- Rebase to libtool 2.4.7 (#2065004)
* Thu Feb 17 2022 Frederic Berat <fberat@redhat.com> - 2.4.6-50
- Keep compiler generated list of library dependencies.
* Sun Feb 13 2022 Jeff Law <jeffreyalaw@gmail.com> - 2.4.6-49
- Re-enable LTO (completing change from Nov 29, 2021)
* Tue Feb 01 2022 Frederic Berat <fberat@redhat.com> - 2.4.6-48
- Add support for "-fsanitize", rhbz#2024647
- Add support for "-fuse-ld", rhbz#2024647
- Use make macros (based on Tom Stellard work for f33 and Timm Bäder)
https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
- Disable non-PIC test for ARM as this is not supported on this arch
- Use autosetup
- Use plain %%configure
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.6-47
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Jan 10 2022 Jakub Jelinek <jakub@redhat.com> - 2.4.6-46
- bump: for gcc 12.* in rawhide
* Mon Nov 29 2021 Marek Kulik <mkulik@redhat.com> - 2.4.6-45
- Enable LTO build
- Add disable-lto-link-order2.patch to pass tests
* Mon Oct 04 2021 Ondrej Dubaj <odubaj@redhat.com> - 2.4.6-44
- rebuild with automake-1.16.5
* Mon Aug 30 2021 Ondrej Dubaj <odubaj@redhat.com> - 2.4.6-43
- rebuild with automake-1.16.4
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.6-42
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu Mar 25 2021 Ondrej Dubaj <odubaj@redhat.com> - 2.4.6-41
- rebuild with automake-1.16.3
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.6-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Dec 07 2020 Jakub Jelinek <jakub@redhat.com> - 2.4.6-39
- bump: for gcc 11.* in eln
* Sun Dec 06 2020 Jakub Jelinek <jakub@redhat.com> - 2.4.6-38
- bump: for gcc 11.* in rawhide
* Wed Oct 21 2020 Jakub Jelinek <jakub@redhat.com> - 2.4.6-37
- bump: for gcc 11.* in eln
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.6-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Apr 21 2020 Jeff Law <law@redhat.com> - 2.4.6-35
- Disable LTO
* Tue Apr 21 2020 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-34
- bump for new automake, rhbz#1815814
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.6-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 20 2020 Jakub Jelinek <jakub@redhat.com> - 2.4.6-32
- bump: for gcc 10.*
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.6-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Apr 24 2019 Björn Esser <besser82@fedoraproject.org> - 2.4.6-30
- Remove hardcoded gzip suffix from GNU info pages
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.6-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Jan 21 2019 Björn Esser <besser82@fedoraproject.org> - 2.4.6-28
- bump: for gcc 9.*
* Tue Aug 28 2018 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-27
- BR gcc, gcc-c++ (rhbz#1623078)
* Tue Aug 28 2018 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-26
- cleanup post/postun, there are RPM triggers nowadays
- fix error: line 2642: func__fatal_error: command not found (rhbz#1622611)
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.6-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Apr 20 2018 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-24
- harden libltdl.so (rhbz#1548751)
* Mon Mar 26 2018 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-23
- bake in versioned requirement on automake (rhbz#1193591)
- fix testsuite FTBFS against automake 1.16.1
- bypass -specs=* to gcc (rhbz#985592)
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.6-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Mon Jan 29 2018 Jakub Jelinek <jakub@redhat.com> - 2.4.6-21
- bump: for gcc 8.*
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.6-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.6-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Apr 21 2017 Karsten Hopp <karsten@redhat.com> - 2.4.6-18
- use new _module_build macro to limit dependencies for Modularity
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.6-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Feb 02 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-16
- use %%license (rhbz#1418518)
* Fri Jan 27 2017 Jakub Jelinek <jakub@redhat.com> - 2.4.6-15
- bump: for gcc 7.*
- require gcc(major) = 7 rather than gcc = 7.0.1
* Tue Jan 03 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-14
- remove duplicate Requires: entry
- use bcond_without instead of PostgreSQL-packaging 'runselftest'
* Thu Dec 22 2016 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-13
- bump: for gcc 6.3.1
* Fri Sep 02 2016 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-12
- bump: for gcc 6.2.1
* Thu Apr 28 2016 Igor Gnatenko <ignatenko@redhat.com> - 2.4.6-11
- Rebuilt for gcc 6.1.1
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Thu Jan 28 2016 Jakub Jelinek <jakub@redhat.com> - 2.4.6-9
- rebuilt for gcc 6.0.0
* Tue Dec 08 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-8
- disable hardening (#1289759)
* Tue Dec 08 2015 Kalev Lember <klember@redhat.com> - 2.4.6-7
- Rebuilt for gcc 5.3.1
* Thu Nov 5 2015 Orion Poplawski <orion@cora.nwra.com> - 2.4.6-6
- Rebuild for gcc 5.2.1
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat Apr 25 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-4
- don't hack the hardening flag into pre-built libtool
* Thu Apr 23 2015 Kalev Lember <kalevlember@gmail.com> - 2.4.6-3
- rebuilt for gcc 5.1.1
* Tue Apr 14 2015 Kalev Lember <kalevlember@gmail.com> - 2.4.6-2
- rebuilt for gcc 5.0.1
* Tue Feb 17 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-1
- rebase to most recent upstream release 2.4.6 (#1159497)
* Fri Feb 06 2015 Jakub Jelinek <jakub@redhat.com> - 2.4.2-32
- rebuilt for gcc 5.0.0
* Sun Nov 02 2014 Jakub Jelinek <jakub@redhat.com> - 2.4.2-31
- rebuilt for gcc 4.9.2
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.2-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jul 19 2014 Kalev Lember <kalevlember@gmail.com> - 2.4.2-29
- Rebuild once more for gcc 4.9.1
* Fri Jul 18 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2.4.2-28
- Bump again for gcc 4.9.1 in F-21
* Thu Jul 17 2014 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-27
- rebuild for gcc 4.9.1
* Mon Jun 09 2014 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-26
- gcc-java removed from Fedora completely (#1106080)
- spec cleanup and implement RPM/SRPM hack (#429880)
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.2-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Thu Apr 10 2014 Jakub Jelinek <jakub@redhat.com> - 2.4.2-24
- rebuilt for gcc 4.9.0
* Tue Jan 07 2014 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-23
- require findutils (minimal installations) (#1047084)
* Wed Oct 23 2013 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-22
- fix powerpcle patch to reflect what is really in upstream
* Thu Oct 17 2013 Jakub Jelinek <jakub@redhat.com> - 2.4.2-21
- rebuilt for gcc 4.8.2
* Tue Oct 15 2013 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-20
- backport support for powerpc*le-linux to libtool.m4
* Thu Oct 10 2013 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-19
- rebuild once again for new config.{sub,guess} in redhat-rpm-config
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.2-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Jul 10 2013 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-17
- version bump
* Tue Jun 04 2013 Jakub Jelinek <jakub@redhat.com> - 2.4.2-16
- rebuilt for gcc 4.8.1
* Tue May 07 2013 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-15
- revert fix for #636045, thanks to Paolo Bonzini
* Fri Apr 26 2013 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-14
- allow root to copy files into NFS in libtoolize (#740079)
- pre-filter sed's input by dd (#636045)
* Thu Mar 14 2013 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-13
- do not BR gcc-java in RHEL (by dmach)
* Thu Jan 24 2013 Jakub Jelinek <jakub@redhat.com> - 2.4.2-12
- rebuilt for gcc 4.8.0
* Thu Dec 06 2012 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-11
- remove specific version requirements on automake/autoconf
* Thu Oct 25 2012 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-10
- temporarily disable the 'gcj' tests (#869578) -- this is just to (1) allow
build under f18+ and RHEL-7.0 and (2) don't through out upstream testsuite.
Added patch must be removed once the 'ecj' utility is fixed
- libtool-ltdl shouldn't own /usr/share/libtool/ directory
- move the .so file without version back to devel package (sorry for that)
* Mon Oct 22 2012 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-9
- fix fedora-review warnings: s/RPM_BUILD_ROOT/buildroot/, remove trailing
white-spaces, move libltdl.so to ltdl sub-package, remove unnecessary BR
- remove unnecessary newlines
- fix the BuildRequire ~> Require only (#79467 related)
- fix weird build circumstances (don't call ./bootstrap, don't call autoconf
manually, do not touch configure script)
- remove 'tee' invocation for copying testsuite output (the file
'test-suite.log' is good enough)
* Thu Oct 04 2012 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-8
- make the libtool dependant on tar (#794675)
* Fri Sep 21 2012 Dan Horák <dan[at]danny.cz> - 2.4.2-7
- rebuild for gcc 4.7.2
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sun Jul 15 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 2.4.2-5
- Rebuild
* Fri Jun 29 2012 Richard W.M. Jones <rjones@redhat.com> - 2.4.2-4
- Rebuild for gcc 4.7.1 which just entered Rawhide.
* Thu Jan 5 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.4.2-3
- really rebuild for gcc 4.7.0
* Tue Jan 3 2012 Jakub Jelinek <jakub@redhat.com> 2.4.2-2
- rebuilt for gcc 4.7.0
* Fri Dec 2 2011 Tom Callaway <spot@fedoraproject.org> 2.4.2-1
- update to 2.4.2
* Mon Feb 06 2012 Karsten Hopp <karsten@redhat.com> 2.4-8
- fix typo (Bart Van Assche, bugzilla #759376)
* Thu Oct 27 2011 Jakub Jelinek <jakub@redhat.com> 2.4-7
- rebuilt for gcc 4.6.2
@ -586,8 +301,8 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la}
* Thu Dec 07 2006 Karsten Hopp <karsten@redhat.com> 1.5.22-7
- update config.guess, config.sub with newer files from automake-1.10
- skip over lines in /etc/ld.so.conf.d/* which don't look like absolute paths
(p.e. files from kernel-xen). This avoids having unwanted relative paths in
- skip over lines in /etc/ld.so.conf.d/* which don't look like absolute paths
(p.e. files from kernel-xen). This avoids having unwanted relative paths in
lib_search_path
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.5.22-6.1
@ -726,7 +441,7 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la}
- rebuild
* Thu Jul 17 2003 Jens Petersen <petersen@redhat.com> - 1.5-5
- bring back libtool-1.4.2-demo.patch to disable nopic tests on amd64
- bring back libtool-1.4.2-demo.patch to disable nopic tests on amd64
and s390x again
* Tue Jul 15 2003 Owen Taylor <otaylor@redhat.com>
@ -737,7 +452,7 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la}
[reported by twaugh]
- use -nostdlib also when linking with g++ and non-GNU ld in
_LT_AC_LANG_CXX_CONFIG [reported by fnasser, patch by aoliva]
- use %%configure with CC and CXX set
- use %%configure with CC and CXX set
* Thu Jun 12 2003 Jens Petersen <petersen@redhat.com> - 1.5-3
- don't use %%configure since target options caused libtool to assume
@ -817,7 +532,7 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la}
* Fri Sep 13 2002 Nalin Dahyabhai <nalin@redhat.com>
- patch to find the proper libdir on multilib boxes
* Mon Aug 19 2002 Jens Petersen <petersen@redhat.com> 1.4.2-12
- don't include demo in doc, specially now that we "make check" (#71609)
@ -938,7 +653,7 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la}
- disable the --cache-file passing to ltconfig; this breaks the older
ltconfig scripts found around.
* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
- auto rebuild in the new build environment (release 2)
* Fri Mar 19 1999 Jeff Johnson <jbj@redhat.com>

View File

@ -1 +1 @@
SHA512 (libtool-2.4.7.tar.xz) = 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da
4e6144439d95d7332dc50ace6dd24c55 libtool-2.4.tar.xz