packages: rpm-build-macros/rpm.macros - %__spec_install_post_check_so: prin...

sparky sparky at pld-linux.org
Wed Oct 20 12:36:58 CEST 2010


Author: sparky                       Date: Wed Oct 20 10:36:58 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- %__spec_install_post_check_so: print unresolved symbols for libraries even
  if they were marked in %skip_post_check_so

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.587 -> 1.588) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.587 packages/rpm-build-macros/rpm.macros:1.588
--- packages/rpm-build-macros/rpm.macros:1.587	Wed Oct 20 12:24:52 2010
+++ packages/rpm-build-macros/rpm.macros	Wed Oct 20 12:36:52 2010
@@ -661,8 +661,7 @@
     fail=0; \
     printf "Searching for shared objects with unresolved symbols..."; \
     for f in $(find $RPM_BUILD_ROOT -type f -name '*.so.*' -print); do \
-	    %{?skip_post_check_so:awk -v "file=$f" 'BEGIN { split("%{skip_post_check_so}", R); for (i=1; i in R; i++) { if (file ~ "(^|/)" R[i] "$") exit(1); } }' || continue;} \
-        LC_ALL=C objdump -T $f 2> /dev/null | LC_ALL=C awk -v "file=$f" 'BEGIN { found=0; skip["program_name"]=1; symbols = "" } /^[0-9a-z]+ +D +\*UND\*/ { if ($NF in skip) { next; }; found = 1; symbols = symbols "\n\t" $NF } END { if (found) { print "\nUnresolved symbols found in: " file symbols; exit(1); } } ' || fail=1 ; \
+        LC_ALL=C objdump -T $f 2> /dev/null | LC_ALL=C awk -v "file=$f" 'BEGIN { found=0; skip["program_name"]=1; symbols = "" } /^[0-9a-z]+ +D +\*UND\*/ { if ($NF in skip) { next; }; found = 1; symbols = symbols "\n\t" $NF } END { if (found) { print "\nUnresolved symbols found in: " file symbols; %{?skip_post_check_so:split("%{skip_post_check_so}", R); for (i=1; i in R; i++) { if (file ~ "(^|/)" R[i] "$") { print "Library marked with skip_post_check_so, ignoring errors.\n"; exit(0); } } } exit(1); } } ' || fail=1 ; \
     done ; \
     echo " DONE"; \
     %{!?no_install_post_check_so:return $fail;} \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.587&r2=1.588&f=u



More information about the pld-cvs-commit mailing list