diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-04-12 15:02:45 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-04-12 20:05:23 +0200 |
| commit | 7ba4d6f367aacec69b3a3707e55085cc7303e573 (patch) | |
| tree | 72fd7ebf8dd144551eebfe74283b58f8e1c7ca4f /external | |
| parent | 2977e8d7c2a0bf62fa70a728a88cc6bddfc87ffd (diff) | |
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@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/asan.patch | 20 |
1 files changed, 20 insertions, 0 deletions
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 @@ |