diff options
| author | Karsten Hopp <karsten@fedoraproject.org> | 2006-06-06 11:39:25 +0000 |
|---|---|---|
| committer | Karsten Hopp <karsten@fedoraproject.org> | 2006-06-06 11:39:25 +0000 |
| commit | 2e9a86c2fd07c445fbb3a2cf5e1ac16c604b9c04 (patch) | |
| tree | f3b32bf758280a357b876a5dfd914e443af3d9ed | |
| parent | a1e8abd4bc8148e1c4a930250e7fc3065322dd1a (diff) | |
| download | libtool-2e9a86c2fd07c445fbb3a2cf5e1ac16c604b9c04.tar.gz libtool-2e9a86c2fd07c445fbb3a2cf5e1ac16c604b9c04.tar.xz libtool-2e9a86c2fd07c445fbb3a2cf5e1ac16c604b9c04.zip | |
- don't warn when /etc/ld.so.conf.d/*.conf doesn't exist (p.e. in mock)libtool-1_5_22-4
| -rw-r--r-- | libtool-1.5.18-multilib.patch | 2 | ||||
| -rw-r--r-- | libtool.spec | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libtool-1.5.18-multilib.patch b/libtool-1.5.18-multilib.patch index 8fedbd7..f9e4ca9 100644 --- a/libtool-1.5.18-multilib.patch +++ b/libtool-1.5.18-multilib.patch @@ -23,7 +23,7 @@ + # 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' ' '` + 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${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi diff --git a/libtool.spec b/libtool.spec index 18ed238..0c4ce11 100644 --- a/libtool.spec +++ b/libtool.spec @@ -4,7 +4,7 @@ Summary: The GNU Portable Library Tool Name: libtool Version: %{upstream_version} -Release: 3 +Release: 4 License: GPL Group: Development/Tools Source: http://ftp.gnu.org/gnu/libtool/libtool-%{upstream_version}.tar.gz @@ -141,6 +141,9 @@ fi %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 - rebuilt with GCC 4.1.0 |