rpms/libtool
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update patch file.

Browse Source
This commit is contained in:
aoliva 2005-05-17 04:16:21 +00:00
parent 9708da19b0
commit bc8cbcf8e1
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libtool-1.5.18-multilib.patch Normal file
View File

@ -0,0 +1,31 @@
--- libtool-1.5.14/libtool.m4.multilib 2005-02-12 12:18:34.000000000 +0000
+++ libtool-1.5.14/libtool.m4 2005-02-15 08:48:42.189498479 +0000
@@ -1456,10 +1456,27 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# 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)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on

7
libtool.spec
View File

@ -4,13 +4,13 @@
Summary: The GNU Portable Library Tool Summary: The GNU Portable Library Tool
Name: libtool Name: libtool
Version: %{upstream_version} Version: %{upstream_version}
Release: 1 Release: 2
License: GPL License: GPL
Group: Development/Tools Group: Development/Tools
Source: http://ftp.gnu.org/gnu/libtool/libtool-%{upstream_version}.tar.gz Source: http://ftp.gnu.org/gnu/libtool/libtool-%{upstream_version}.tar.gz
URL: http://www.gnu.org/software/libtool/ URL: http://www.gnu.org/software/libtool/
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-root
Patch1: libtool-1.5.14-multilib.patch Patch1: libtool-1.5.18-multilib.patch
PreReq: /sbin/install-info PreReq: /sbin/install-info
BuildRequires: autoconf >= 2.59, automake >= 1.9.2, texinfo BuildRequires: autoconf >= 2.59, automake >= 1.9.2, texinfo
# make sure we can configure all supported langs # make sure we can configure all supported langs
@ -136,6 +136,9 @@ fi
%changelog %changelog
* Tue May 17 2005 Alexandre Oliva <aoliva@redhat.com> 1.5.18-2
- Update patch file.
* Tue May 17 2005 Alexandre Oliva <aoliva@redhat.com> 1.5.18-1 * Tue May 17 2005 Alexandre Oliva <aoliva@redhat.com> 1.5.18-1
- 1.5.18. Removed .multilib2 suffix. - 1.5.18. Removed .multilib2 suffix.