|
 |
008921 |
This patch undoes parts of the following upstream patches:
|
|
|
008921 |
|
|
|
008921 |
commit 19442df2cd9a5bc8ec4deded7046ea7aca1d50a2
|
|
|
008921 |
Author: Kota Tsuyuzaki <tsuyuzaki.kota@lab.ntt.co.jp>
|
|
|
008921 |
Date: Mon Feb 20 14:12:43 2017 -0800
|
|
|
008921 |
|
|
|
008921 |
Fix warning on automake tool
|
|
|
008921 |
|
|
|
008921 |
..........
|
|
|
008921 |
|
|
|
008921 |
Change-Id: I0e79bed7755a1f286b746a70fcf56fdc972bfd5d
|
|
|
008921 |
|
|
|
008921 |
commit b046ff7091e710ecafb31b13678e0092fd1d3fd7
|
|
|
008921 |
Author: Ondřej Nový <novy@ondrej.org>
|
|
|
008921 |
Date: Sun Sep 30 12:23:22 2018 +0200
|
|
|
008921 |
|
|
|
008921 |
Fix building with LD_LIBRARY_PATH set
|
|
|
008921 |
|
|
|
008921 |
..........
|
|
|
008921 |
|
|
|
008921 |
Change-Id: Ib7a1d6b839d4a207ee0471b55233e1ce5d958705
|
|
|
008921 |
|
|
|
008921 |
diff -ur liberasurecode-1.6.1/Makefile.am liberasurecode-1.6.1-p3/Makefile.am
|
|
|
008921 |
--- liberasurecode-1.6.1/Makefile.am 2019-05-24 08:10:22.000000000 -0500
|
|
|
008921 |
+++ liberasurecode-1.6.1-p3/Makefile.am 2020-02-05 21:12:35.031620770 -0600
|
|
|
008921 |
@@ -46,20 +46,38 @@
|
|
|
008921 |
$(LN_S) liberasurecode/config_liberasurecode.h)
|
|
|
008921 |
|
|
|
008921 |
test: check
|
|
|
008921 |
- @./test/liberasurecode_test
|
|
|
008921 |
- @./test/alg_sig_test
|
|
|
008921 |
- @./test/test_xor_hd_code
|
|
|
008921 |
- @./test/libec_slap
|
|
|
008921 |
+ $(eval SONAMES := $(shell find $(abs_top_builddir) -name '*.so'))
|
|
|
008921 |
+ $(eval SODIRS := $(dir $(SONAMES)))
|
|
|
008921 |
+ $(eval LD_LIBRARY_PATH := LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(subst / ,/:,$(SODIRS))")
|
|
|
008921 |
+ $(eval DYLD_LIBRARY_PATH := DYLD_LIBRARY_PATH="$(DYLD_LIBRARY_PATH):$(subst / ,/:,$(SODIRS))")
|
|
|
008921 |
+ $(eval DYLD_FALLBACK_LIBRARY_PATH := DYLD_FALLBACK_LIBRARY_PATH=$(DYLD_FALLBACK_LIBRARY_PATH):"$(subst / ,/:,$(SODIRS))")
|
|
|
008921 |
+ @$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \
|
|
|
008921 |
+ ./test/liberasurecode_test
|
|
|
008921 |
+ @$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \
|
|
|
008921 |
+ ./test/alg_sig_test
|
|
|
008921 |
+ @$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \
|
|
|
008921 |
+ ./test/test_xor_hd_code
|
|
|
008921 |
+ @$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \
|
|
|
008921 |
+ ./test/libec_slap
|
|
|
008921 |
|
|
|
008921 |
VALGRIND_EXEC_COMMAND = $(LIBTOOL_COMMAND) valgrind --tool=memcheck \
|
|
|
008921 |
--error-exitcode=1 --leak-check=yes --track-fds=yes \
|
|
|
008921 |
--malloc-fill=A5 --free-fill=DE --fullpath-after=. --trace-children=yes
|
|
|
008921 |
|
|
|
008921 |
valgrind-test: check
|
|
|
008921 |
- @$(VALGRIND_EXEC_COMMAND) ./test/alg_sig_test
|
|
|
008921 |
- @$(VALGRIND_EXEC_COMMAND) ./test/liberasurecode_test
|
|
|
008921 |
- @$(VALGRIND_EXEC_COMMAND) ./test/test_xor_hd_code
|
|
|
008921 |
- @$(VALGRIND_EXEC_COMMAND) ./test/libec_slap
|
|
|
008921 |
+ $(eval SONAMES := $(shell find $(abs_top_builddir) -name '*.so'))
|
|
|
008921 |
+ $(eval SODIRS := $(dir $(SONAMES)))
|
|
|
008921 |
+ $(eval LD_LIBRARY_PATH := LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(subst / ,/:,$(SODIRS))")
|
|
|
008921 |
+ $(eval DYLD_LIBRARY_PATH := DYLD_LIBRARY_PATH="$(DYLD_LIBRARY_PATH):$(subst / ,/:,$(SODIRS))")
|
|
|
008921 |
+ $(eval DYLD_FALLBACK_LIBRARY_PATH := DYLD_FALLBACK_LIBRARY_PATH=$(DYLD_FALLBACK_LIBRARY_PATH):"$(subst / ,/:,$(SODIRS))")
|
|
|
008921 |
+ @$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \
|
|
|
008921 |
+ $(VALGRIND_EXEC_COMMAND) ./test/alg_sig_test
|
|
|
008921 |
+ @$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \
|
|
|
008921 |
+ $(VALGRIND_EXEC_COMMAND) ./test/liberasurecode_test
|
|
|
008921 |
+ @$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \
|
|
|
008921 |
+ $(VALGRIND_EXEC_COMMAND) ./test/test_xor_hd_code
|
|
|
008921 |
+ @$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \
|
|
|
008921 |
+ $(VALGRIND_EXEC_COMMAND) ./test/libec_slap
|
|
|
008921 |
|
|
|
008921 |
CLEANFILES = cscope.in.out cscope.out cscope.po.out
|
|
|
008921 |
|