Author: glen Date: Tue Nov 9 10:37:36 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- tabs
---- Files affected:
packages/rpm-build-macros:
rpm.macros (1.590 -> 1.591)
---- Diffs:
================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.590
packages/rpm-build-macros/rpm.macros:1.591
--- packages/rpm-build-macros/rpm.macros:1.590 Mon Oct 25 15:00:05 2010
+++ packages/rpm-build-macros/rpm.macros Tue Nov 9 11:37:30 2010
@@ -659,14 +659,14 @@
# %define skip_post_check_so libwithoutfoo.so.* libwithoutbar.so.*
#
%__spec_install_post_check_so { \
- __spec_install_post_check_so() { \
- fail=0; \
- printf "Searching for shared objects with unresolved symbols..."; \
- for f in $(find $RPM_BUILD_ROOT -type f -name '*.so.*' -print); do \
- 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;} \
+__spec_install_post_check_so() { \
+ fail=0; \
+ printf "Searching for shared objects with unresolved symbols..."; \
+ for f in $(find $RPM_BUILD_ROOT -type f -name '*.so.*' -print); do \
+ 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;} \
}; __spec_install_post_check_so }}
#-----------------------------------------------------------------
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.590&r2=1.591&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
