external/firebird/ExternalProject_firebird.mk | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit bca0dc97bf3d1348c928bdaf4964524374835823
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Nov 26 10:42:40 2020 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Nov 26 11:50:37 2020 +0100
Revert "external/firebird: Pass --enable-developer into configure"
This reverts commit 823059c8f046927c3193da5acd78053f3269b753. It was meant
as a
prerequisite for a macOS-specific fix in patch set 19 of
<https://gerrit.libreoffice.org/c/core/+/105440/19> "firebird: update to
3.0.7",
but caused both the Jenkins Windows build of that Gerrit change's patch
set, as
well as vmiklos' Linux build based on
823059c8f046927c3193da5acd78053f3269b753
to fail with "Could not find acceptable ICU library" messages. The reasons
have
not been tracked down, but are presumably because
workdir/UnpackedTarball/firebird/gen/Makefile starts to execute some more
recipe
lines based on IsDeveloper being "Y". Lets seek another fix for the macOS
issue
instead.
Change-Id: I4bd6ad38bc0fc0ef2debd5ef55131bccbff54ebc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106675
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 b143e750103d..8f8a8230227f 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -68,7 +68,6 @@ $(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 \
@@ -81,7 +80,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
'<' 101200)), \
ac_cv_func_clock_gettime=no)) \
&& LC_ALL=C $(MAKE) \
- SHELL='$(SHELL)' $(if $(filter
LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
+ $(if $(ENABLE_DEBUG),Debug) 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
