[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/libtool/devel libtool-1.5.18-multilib.patch, 1.1, 1.2 libtool.spec, 1.40, 1.41



Author: karsten

Update of /cvs/dist/rpms/libtool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21092

Modified Files:
	libtool-1.5.18-multilib.patch libtool.spec 
Log Message:
- don't warn when /etc/ld.so.conf.d/*.conf doesn't exist (p.e. in mock)

libtool-1.5.18-multilib.patch:
 libtool.m4 |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletion(-)

Index: libtool-1.5.18-multilib.patch
===================================================================
RCS file: /cvs/dist/rpms/libtool/devel/libtool-1.5.18-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtool-1.5.18-multilib.patch	17 May 2005 04:16:21 -0000	1.1
+++ libtool-1.5.18-multilib.patch	6 Jun 2006 11:39:25 -0000	1.2
@@ -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


Index: libtool.spec
===================================================================
RCS file: /cvs/dist/rpms/libtool/devel/libtool.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libtool.spec	26 May 2006 06:36:04 -0000	1.40
+++ libtool.spec	6 Jun 2006 11:39:25 -0000	1.41
@@ -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 @@
 
 
 %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
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]