rpms/abicheck/devel abicheck-1.2-ldlinux.patch, 1.1, 1.2 abicheck.spec, 1.26, 1.27

Michael Schwendt (mschwendt) fedora-extras-commits at redhat.com
Thu Mar 2 18:12:34 UTC 2006


Author: mschwendt

Update of /cvs/extras/rpms/abicheck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26784

Modified Files:
	abicheck-1.2-ldlinux.patch abicheck.spec 
Log Message:
update dynamic linker patch

abicheck-1.2-ldlinux.patch:

Index: abicheck-1.2-ldlinux.patch
===================================================================
RCS file: /cvs/extras/rpms/abicheck/devel/abicheck-1.2-ldlinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- abicheck-1.2-ldlinux.patch	16 Aug 2005 20:51:30 -0000	1.1
+++ abicheck-1.2-ldlinux.patch	2 Mar 2006 18:12:33 -0000	1.2
@@ -30,7 +30,7 @@
 +	my $ldlinux = '';
 +	open(DLFIND,"ldd $file0 |") or die "open: ldd: $!";
 +	while (<DLFIND>) {
-+	    /ld-linux/ and /(\S+)/ and $ldlinux = $1;
++	    /(ld(-linux)*.so.\d+)/ and /(\S+)/ and $ldlinux = $1;
 +	}
 +	close(DLFIND);
 +	if ( $ldlinux =~ /^$/ ) {


Index: abicheck.spec
===================================================================
RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- abicheck.spec	2 Mar 2006 17:47:52 -0000	1.26
+++ abicheck.spec	2 Mar 2006 18:12:33 -0000	1.27
@@ -47,16 +47,7 @@
 
 
 %check
-cd test
-make public1 private1 libc_a
-file public1 private1
-ldd public1 private1
-LD_DEBUG=files,bindings LD_VERBOSE=yes LD_WARN=yes LD_BIND_NOW=yes LD_TRACE_LOADED_OBJECTS=1 /lib/ld-linux.so.2 -r ./public1 > output.txt 2>&1 || :
-cat output.txt
-LD_DEBUG=files,bindings LD_VERBOSE=yes LD_WARN=yes LD_BIND_NOW=yes LD_TRACE_LOADED_OBJECTS=1 /lib/ld-linux.so.2 -r ./private1 > output.txt 2>&1 || :
-cat output.txt
-make
-#make test
+make test
 
 
 %clean




More information about the scm-commits mailing list