external/firebird/asan.patch | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 9ddc4b62b4bdf04a2aeeddb053b00ccc031e83ef
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Apr 13 09:11:00 2018 +0200
external/firebird: Even more LIBO_TUNNEL_LIBRARY_PATH
...as needed by some builders, apparently.
Change-Id: I94f3059121d21d55fc7f87d5554bf192f6858e06
diff --git a/external/firebird/asan.patch b/external/firebird/asan.patch
index 1edcf86bce29..4c40f52bfc87 100644
--- a/external/firebird/asan.patch
+++ b/external/firebird/asan.patch
@@ -57,15 +57,17 @@
$(BUILD_FILE): $(BUILD_Objects) $(COMMON_LIB)
--- builds/posix/Makefile.in.examples
+++ builds/posix/Makefile.in.examples
-@@ -123,7 +123,7 @@
+@@ -123,8 +123,8 @@
$(EMPLOYEE_DB): $(EXAMPLES_DEST)/empbuild$(EXEC_EXT) $(INPUT_Sources)
$(EXAMPLES_DEST)/isql$(EXEC_EXT)
-$(RM) $(EMPLOYEE_DB)
- ./empbuild $(EMPLOYEE_DB)
+- $(GFIX) -write sync $(EMPLOYEE_DB)
+ $(LIBO_TUNNEL_LIBRARY_PATH) ./empbuild $(EMPLOYEE_DB)
- $(GFIX) -write sync $(EMPLOYEE_DB)
++ $(LIBO_TUNNEL_LIBRARY_PATH) $(GFIX) -write sync $(EMPLOYEE_DB)
-$(CHMOD_6) $(EMPLOYEE_DB)
+ # To get past the fact isql is called from the programs, we create a local
link in this directory
@@ -140,7 +140,7 @@
$(EXAMPLES_DEST)/empbuild.fdb : $(EXAMPLES_DEST)/empddl.sql
$(EXAMPLES_DEST)/empbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
