Author: baggins Date: Thu Oct 14 08:45:51 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- reduce awk invocations in check_so (by Przemysław Iskra, sparky -*-
pld-linux.org)
---- Files affected:
packages/rpm-build-macros:
rpm.macros (1.583 -> 1.584)
---- Diffs:
================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.583
packages/rpm-build-macros/rpm.macros:1.584
--- packages/rpm-build-macros/rpm.macros:1.583 Wed Oct 13 14:19:03 2010
+++ packages/rpm-build-macros/rpm.macros Thu Oct 14 10:45:45 2010
@@ -645,7 +645,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:echo %{skip_post_check_so} | LC_ALL=C awk '{
gsub(/[ \t]+/,"\n"); print }' | LC_ALL=C awk -v "file=$f" 'file ~ "(^|/)" $0
"$" { exit(1) }' || continue ;} \
+ %{?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 ; \
done ; \
echo " DONE"; \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.583&r2=1.584&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
