shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

make: support comments in exported symbols

Browse Source 
Now the lines starting with '#' in exported symbols files are treated as
comments (ignored).
This commit is contained in:
Zdenek Kabelac 2019-07-30 15:31:01 +02:00
parent 3fcb4697f6
commit f2489d9dda
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libdm/make.tmpl.in
View File

@ -512,17 +512,17 @@ EXPORTED_SYMBOLS := $(wildcard $(srcdir)/.exported_symbols.Base $(srcdir)/.expor
.export.sym: .exported_symbols_generated $(EXPORTED_SYMBOLS) .export.sym: .exported_symbols_generated $(EXPORTED_SYMBOLS)
ifeq (,$(firstword $(EXPORTED_SYMBOLS))) ifeq (,$(firstword $(EXPORTED_SYMBOLS)))
$(Q) set -e; (echo "Base {"; echo " global:";\ $(Q) set -e; (echo "Base {"; echo " global:";\
$(SED) "s/^/ /;s/$$/;/" $<;\ $(SED) "/^#/d;s/^/ /;s/$$/;/" $<;\
echo "};";\ echo "};";\
echo "Local {"; echo " local:"; echo " *;"; echo "};";\ echo "Local {"; echo " local:"; echo " *;"; echo "};";\
) > $@ ) > $@
else else
$(Q) set -e;\ $(Q) set -e;\
R=$$($(SORT) $^ | uniq -u);\ R=$$($(SORT) $^ | $(GREP) -v "^#" | uniq -u);\
test -z "$$R" || { echo "Mismatch between symbols in shared library and lists in .exported_symbols.* files: $$R"; false; } ;\ test -z "$$R" || { echo "Mismatch between symbols in shared library and lists in .exported_symbols.* files: $$R"; false; } ;\
( for i in $$(echo $(EXPORTED_SYMBOLS) | tr ' ' '\n' | $(SORT) -rnt_ -k5 ); do\ ( for i in $$(echo $(EXPORTED_SYMBOLS) | tr ' ' '\n' | $(SORT) -rnt_ -k5 ); do\
echo "$${i##*.} {"; echo " global:";\ echo "$${i##*.} {"; echo " global:";\
$(SED) "s/^/ /;s/$$/;/" $$i;\ $(SED) "/^#/d;s/^/ /;s/$$/;/" $$i;\
echo "};";\ echo "};";\
done;\ done;\
echo "Local {"; echo " local:"; echo " *;"; echo "};";\ echo "Local {"; echo " local:"; echo " *;"; echo "};";\

6
make.tmpl.in
View File

@ -551,17 +551,17 @@ EXPORTED_SYMBOLS := $(wildcard $(srcdir)/.exported_symbols.Base $(srcdir)/.expor
.export.sym: .exported_symbols_generated $(EXPORTED_SYMBOLS) .export.sym: .exported_symbols_generated $(EXPORTED_SYMBOLS)
ifeq (,$(firstword $(EXPORTED_SYMBOLS))) ifeq (,$(firstword $(EXPORTED_SYMBOLS)))
$(Q) set -e; (echo "Base {"; echo " global:";\ $(Q) set -e; (echo "Base {"; echo " global:";\
$(SED) "s/^/ /;s/$$/;/" $<;\ $(SED) "/^#/d;s/^/ /;s/$$/;/" $<;\
echo "};";\ echo "};";\
echo "Local {"; echo " local:"; echo " *;"; echo "};";\ echo "Local {"; echo " local:"; echo " *;"; echo "};";\
) > $@ ) > $@
else else
$(Q) set -e;\ $(Q) set -e;\
R=$$($(SORT) $^ | uniq -u);\ R=$$($(SORT) $^ | $(GREP) -v "^#" | uniq -u);\
test -z "$$R" || { echo "Mismatch between symbols in shared library and lists in .exported_symbols.* files: $$R"; false; } ;\ test -z "$$R" || { echo "Mismatch between symbols in shared library and lists in .exported_symbols.* files: $$R"; false; } ;\
( for i in $$(echo $(EXPORTED_SYMBOLS) | tr ' ' '\n' | $(SORT) -rnt_ -k5 ); do\ ( for i in $$(echo $(EXPORTED_SYMBOLS) | tr ' ' '\n' | $(SORT) -rnt_ -k5 ); do\
echo "$${i##*.} {"; echo " global:";\ echo "$${i##*.} {"; echo " global:";\
$(SED) "s/^/ /;s/$$/;/" $$i;\ $(SED) "/^#/d;s/^/ /;s/$$/;/" $$i;\
echo "};";\ echo "};";\
done;\ done;\
echo "Local {"; echo " local:"; echo " *;"; echo "};";\ echo "Local {"; echo " local:"; echo " *;"; echo "};";\