- don't warn when /etc/ld.so.conf.d/*.conf doesn't exist (p.e. in mock)

This commit is contained in:
Karsten Hopp 2006-06-06 11:39:25 +00:00
parent a1e8abd4bc
commit 2e9a86c2fd
2 changed files with 5 additions and 2 deletions

View File

@ -23,7 +23,7 @@
+ +
# Append ld.so.conf contents to the search path # Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then 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' ' '` 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/#.*//;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 /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi fi

View File

@ -4,7 +4,7 @@
Summary: The GNU Portable Library Tool Summary: The GNU Portable Library Tool
Name: libtool Name: libtool
Version: %{upstream_version} Version: %{upstream_version}
Release: 3 Release: 4
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
@ -141,6 +141,9 @@ fi
%changelog %changelog
* Tue Jun 06 2006 Karsten Hopp <karsten@redhat.de> 1.5.22-4
- don't warn when /etc/ld.so.conf.d/*.conf doesn't exist (p.e. in mock)
* Fri May 26 2006 Jakub Jelinek <jakub@redhat.com> 1.5.22-3 * Fri May 26 2006 Jakub Jelinek <jakub@redhat.com> 1.5.22-3
- rebuilt with GCC 4.1.0 - rebuilt with GCC 4.1.0