openstack
/
liberasurecode
Code Issues Proposed changes

Fix building with LD_LIBRARY_PATH set 

If LD_LIBRARY_PATH is set to any value, build will fail, example:
Making check in doc
...
/bin/bash: line 1: /usr/lib/libeatmydata: No such file or directory
...

See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906480

Same is true for DYLD_LIBRARY_PATH and DYLD_FALLBACK_LIBRARY_PATH.

This bug was introduced with commit 19442df2cd
where Kota removed evals, but forgot to remove prepending of same env
variables.

Change-Id: Ib7a1d6b839d4a207ee0471b55233e1ce5d958705
This commit is contained in:
Ondřej Nový 2018-09-30 12:23:22 +02:00
parent 7df6c25191
commit b046ff7091
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile.am
View File

@ -46,28 +46,20 @@ install-exec-hook:
$(LN_S) liberasurecode/config_liberasurecode.h) $(LN_S) liberasurecode/config_liberasurecode.h)
test: check test: check
@$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \ @./test/liberasurecode_test
./test/liberasurecode_test @./test/alg_sig_test
@$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \ @./test/test_xor_hd_code
./test/alg_sig_test @./test/libec_slap
@$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \
./test/test_xor_hd_code
@$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \
./test/libec_slap
VALGRIND_EXEC_COMMAND = $(LIBTOOL_COMMAND) valgrind --tool=memcheck \ VALGRIND_EXEC_COMMAND = $(LIBTOOL_COMMAND) valgrind --tool=memcheck \
--error-exitcode=1 --leak-check=yes --track-fds=yes \ --error-exitcode=1 --leak-check=yes --track-fds=yes \
--malloc-fill=A5 --free-fill=DE --fullpath-after=. --trace-children=yes --malloc-fill=A5 --free-fill=DE --fullpath-after=. --trace-children=yes
valgrind-test: check valgrind-test: check
@$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) $(VALGRIND_EXEC_COMMAND) \ @$(VALGRIND_EXEC_COMMAND) ./test/alg_sig_test
./test/alg_sig_test @$(VALGRIND_EXEC_COMMAND) ./test/liberasurecode_test
@$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) $(VALGRIND_EXEC_COMMAND) \ @$(VALGRIND_EXEC_COMMAND) ./test/test_xor_hd_code
./test/liberasurecode_test @$(VALGRIND_EXEC_COMMAND) ./test/libec_slap
@$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) $(VALGRIND_EXEC_COMMAND) \
./test/test_xor_hd_code
@$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) $(VALGRIND_EXEC_COMMAND) \
./test/libec_slap
CLEANFILES = cscope.in.out cscope.out cscope.po.out CLEANFILES = cscope.in.out cscope.out cscope.po.out