[Libreoffice-commits] core.git: external/firebird

[Stephan Bergmann]

 external/firebird/asan.patch |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

New commits:
commit 7ba4d6f367aacec69b3a3707e55085cc7303e573
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Apr 12 15:02:45 2018 +0200

    external/firebird: More LIBO_TUNNEL_LIBRARY_PATH
    
    ...after 14955ed91b282ccbb395cb47c6d76e3b42b34748 "external/firebird: Support
    Clang ASan", which was oddly enough only necessary on one machine,
    <https://ci.libreoffice.org/job/lo_tb_master_linux/26757/console>, but not on
    others.  Maybe the best fix overall would be to just not build examples at all,
    as is already done in external/firebird/firebird-cygwin-msvc.patch.
    
    Change-Id: I7dd37c93ea5a55cb26a167e52d22a6f50c05494e
    Reviewed-on: https://gerrit.libreoffice.org/52779
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/firebird/asan.patch b/external/firebird/asan.patch
index 33d418513fba..fa9c4d88b249 100644
--- a/external/firebird/asan.patch
+++ b/external/firebird/asan.patch
@@ -55,6 +55,26 @@
  	$(CHMOD_6) $@
  
  $(BUILD_FILE):	$(BUILD_Objects) $(COMMON_LIB)
+--- builds/posix/Makefile.in.examples
++++ builds/posix/Makefile.in.examples
+@@ -140,7 +140,7 @@
+ 
+ $(EXAMPLES_DEST)/empbuild.fdb : $(EXAMPLES_DEST)/empddl.sql $(EXAMPLES_DEST)/empbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT)
+ 	-$(RM) $(EXAMPLES_DEST)/empbuild.fdb
+-	$(EXAMPLES_DEST)/isql$(EXEC_EXT) -i empbld.sql
++	$(LIBO_TUNNEL_LIBRARY_PATH) $(EXAMPLES_DEST)/isql$(EXEC_EXT) -i empbld.sql
+ 
+ # The chain for intlemp.fdb is the same a script file to create an empty database
+ # to allow a .e program to be compiled, to then create and populate with data
+@@ -158,7 +158,7 @@
+ 
+ $(EXAMPLES_DEST)/intlbuild.fdb : $(EXAMPLES_DEST)/intlddl.sql $(EXAMPLES_DEST)/intlbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT)
+ 	-$(RM) intlbuild.fdb
+-	$(EXAMPLES_DEST)/isql$(EXEC_EXT) -i intlbld.sql
++	$(LIBO_TUNNEL_LIBRARY_PATH) $(EXAMPLES_DEST)/isql$(EXEC_EXT) -i intlbld.sql
+ 
+ 
+ $(EXAMPLES_DEST)/%.sql: $(EXAMPLES_SRC)/empbuild/%.sql
 --- builds/posix/make.rules
 +++ builds/posix/make.rules
 @@ -68,17 +68,17 @@