external/firebird/ExternalProject_firebird.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 823059c8f046927c3193da5acd78053f3269b753
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Nov 25 14:27:54 2020 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Nov 25 17:17:11 2020 +0100
external/firebird: Pass --enable-developer into configure
...instead of merely forcing the Make target to Debug. That way, a future
patch set of in-progress <https://gerrit.libreoffice.org/c/core/+/105440/16>
"firebird: update to 3.0.7" will be able to know in the gen/examples sub-
directory Make that the top-level Make was targeting Debug, not Release.
(Which
it will presumably need to know to fix the macOS build.)
Change-Id: I57f90f66b4739b9d2cb5c33d79fcb87090c820bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106588
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/firebird/ExternalProject_firebird.mk
b/external/firebird/ExternalProject_firebird.mk
index 8f8a8230227f..b143e750103d 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -68,6 +68,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
&& MAKE=$(MAKE) ./configure \
--without-editline \
--with-wire-compress=no \
+ $(if $(ENABLE_DEBUG),--enable-developer) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
$(if $(DISABLE_DYNLOADING), \
--enable-static --disable-shared \
@@ -80,7 +81,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
'<' 101200)), \
ac_cv_func_clock_gettime=no)) \
&& LC_ALL=C $(MAKE) \
- $(if $(ENABLE_DEBUG),Debug) SHELL='$(SHELL)' $(if
$(filter LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
+ SHELL='$(SHELL)' $(if $(filter
LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
MATHLIB="$(if
$(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_LIBS),-L$(call
gb_UnpackedTarball_get_dir,libtommath) -ltommath)" \
LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst
$$,$$$$,$(call gb_Helper_extend_ld_path,$(call
gb_UnpackedTarball_get_dir,icu)/source/lib)))' \
$(if $(filter MACOSX,$(OS)), \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
