RepositoryExternal.mk | 6 +++---
external/firebird/ExternalPackage_firebird.mk | 16 ++++++++--------
external/firebird/ExternalProject_firebird.mk | 9 ++++-----
3 files changed, 15 insertions(+), 16 deletions(-)
New commits:
commit 416c552066e3a7a27430753967b3b9fe8104063f
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Oct 17 08:39:09 2016 +0200
external/firebird doesn't know --enable-debug, but make target "Debug"
* There's an --enable-developer configure option, but it probably does more
than
just default to the "Debug" target, things we potentially don't want here.
* Disabling --enable-debug for MSC was apparently a leftover from firebird 2
times, f58f10fc89e19d182b5a415bb69af5ecc7de080a "firebird: --enable-debug
breaks the build with MSVC".
Change-Id: Id9f7b6aa0cdfcea0b07f94814a8dab43488879bb
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 95241ab..5365f6d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2953,16 +2953,16 @@ else # !SYSTEM_FIREBIRD
define gb_LinkTarget__use_libfbembed
$(call gb_LinkTarget_use_package,$(1),firebird)
$(call gb_LinkTarget_set_include,$(1),\
- -I$(call
gb_UnpackedTarball_get_dir,firebird)/gen/Release/firebird/include \
+ -I$(call gb_UnpackedTarball_get_dir,firebird)/gen/$(if
$(ENABLE_DEBUG),Debug,Release)/firebird/include \
$$(INCLUDE) \
)
ifeq ($(COM),MSC)
$(call gb_LinkTarget_add_libs,$(1),\
- $(call
gb_UnpackedTarball_get_dir,firebird)/gen/Release/firebird/bin/ifbclient.lib \
+ $(call gb_UnpackedTarball_get_dir,firebird)/gen/$(if
$(ENABLE_DEBUG),Debug,Release)/firebird/bin/ifbclient.lib \
)
else
$(call gb_LinkTarget_add_libs,$(1),\
- -L$(call gb_UnpackedTarball_get_dir,firebird)/gen/Release/firebird/lib
-lfbclient \
+ -L$(call gb_UnpackedTarball_get_dir,firebird)/gen/$(if
$(ENABLE_DEBUG),Debug,Release)/firebird/lib -lfbclient \
)
endif
diff --git a/external/firebird/ExternalPackage_firebird.mk
b/external/firebird/ExternalPackage_firebird.mk
index 1e8752d..6505eda 100644
--- a/external/firebird/ExternalPackage_firebird.mk
+++ b/external/firebird/ExternalPackage_firebird.mk
@@ -12,17 +12,17 @@ $(eval $(call
gb_ExternalPackage_ExternalPackage,firebird,firebird))
$(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird))
ifeq ($(OS)-$(COM),WNT-MSC)
-$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/ifbclient.dll,gen/Release/firebird/bin/ifbclient.dll))
-$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/Engine12.dll,gen/Release/firebird/plugins/Engine12.dll))
+$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/ifbclient.dll,gen/$(if
$(ENABLE_DEBUG),Debug,Release)/firebird/bin/ifbclient.dll))
+$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/Engine12.dll,gen/$(if
$(ENABLE_DEBUG),Debug,Release)/firebird/plugins/Engine12.dll))
else ifeq ($(OS),MACOSX)
-$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbclient.dylib.3.0.0,gen/Release/firebird/lib/libfbclient.dylib.3.0.0))
-$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libEngine12.dylib,gen/Release/firebird/plugins/libEngine12.dylib))
+$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbclient.dylib.3.0.0,gen/$(if
$(ENABLE_DEBUG),Debug,Release)/firebird/lib/libfbclient.dylib.3.0.0))
+$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libEngine12.dylib,gen/$(if
$(ENABLE_DEBUG),Debug,Release)/firebird/plugins/libEngine12.dylib))
else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbclient.so.2,gen/Release/firebird/lib/libfbclient.so.3.0.0))
-$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libEngine12.so,gen/Release/firebird/plugins/libEngine12.so))
+$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbclient.so.2,gen/$(if
$(ENABLE_DEBUG),Debug,Release)/firebird/lib/libfbclient.so.3.0.0))
+$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libEngine12.so,gen/$(if
$(ENABLE_DEBUG),Debug,Release)/firebird/plugins/libEngine12.so))
endif
-$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_SHARE_FOLDER)/firebird/firebird.msg,gen/Release/firebird/firebird.msg))
-$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_SHARE_FOLDER)/firebird/security3.fdb,gen/Release/firebird/security3.fdb))
+$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_SHARE_FOLDER)/firebird/firebird.msg,gen/$(if
$(ENABLE_DEBUG),Debug,Release)/firebird/firebird.msg))
+$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_SHARE_FOLDER)/firebird/security3.fdb,gen/$(if
$(ENABLE_DEBUG),Debug,Release)/firebird/security3.fdb))
# vim: set noet sw=4 ts=4:
diff --git a/external/firebird/ExternalProject_firebird.mk
b/external/firebird/ExternalProject_firebird.mk
index c943053..3467cc0 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -30,8 +30,8 @@ MAKE_PRE=$(call gb_Helper_extend_ld_path,$(call
gb_UnpackedTarball_get_dir,icu)/
MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl
OOO \
-
$(gb_Package_SOURCEDIR_firebird)/gen/Release/firebird/plugins/libEngine12.dylib
\
-
$(gb_Package_SOURCEDIR_firebird)/gen/Release/firebird/lib/libfbclient.dylib.3.0.0)
+ $(gb_Package_SOURCEDIR_firebird)/gen/$(if
$(ENABLE_DEBUG),Debug,Release)/firebird/plugins/libEngine12.dylib \
+ $(gb_Package_SOURCEDIR_firebird)/gen/$(if
$(ENABLE_DEBUG),Debug,Release)/firebird/lib/libfbclient.dylib.3.0.0)
$(call gb_ExternalProject_get_state_target,firebird,build):
$(call gb_ExternalProject_run,build,\
@@ -76,7 +76,6 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
&& MAKE=$(MAKE) ./configure \
--without-editline \
--with-wire-compress=no \
- $(if $(filter-out MSC,$(COM)),$(if
$(ENABLE_DEBUG),--enable-debug)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
$(if $(DISABLE_DYNLOADING), \
--enable-static --disable-shared \
@@ -89,9 +88,9 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
'<' 101200)), \
ac_cv_func_clock_gettime=no)) \
&& if [ -n "$${FB_CPU_ARG}" ]; then \
- $(MAKE_PRE) $(MAKE) $(INVOKE_FPA) SHELL='$(SHELL)'
$(MAKE_POST); \
+ $(MAKE_PRE) $(MAKE) $(if $(ENABLE_DEBUG),Debug)
$(INVOKE_FPA) SHELL='$(SHELL)' $(MAKE_POST); \
else \
- $(MAKE_PRE) $(MAKE) SHELL='$(SHELL)' $(MAKE_POST); \
+ $(MAKE_PRE) $(MAKE) $(if $(ENABLE_DEBUG),Debug)
SHELL='$(SHELL)' $(MAKE_POST); \
fi \
)
# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
