diff options
| author | Wastack <btomi96@gmail.com> | 2016-07-28 17:16:19 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2016-08-17 13:05:40 +0000 |
| commit | 45f42681f4d1260c42140a313560534e605f81a4 (patch) | |
| tree | 1c51f2ba29261c38a3e771dc04968f2e9cb5957f /RepositoryExternal.mk | |
| parent | 0cb7d76bc5552245642ba423a87831cd9e0b2b92 (diff) | |
GSoC Upgrade firebird to 3.0
Embedded firebird is now version 3.0.
Supports MSVC 14.0.
Instead of fbembed, there are now two libraries: fbclient and
Engine12. fbclient is linked as fbembed before, Engine12 is loaded
at runtime from fbclient.
fb now needs system libtommath, which is supplied
as a new ExternalProject of LO.
Change-Id: I132939bdee745795b22f675e4265e9590079c45f
Reviewed-on: https://gerrit.libreoffice.org/27642
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 49 |
1 files changed, 35 insertions, 14 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 806a5e8ec5e9..0345edcbc981 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2901,6 +2901,36 @@ endef endif # SYSTEM_OPENLDAP +ifneq ($(SYSTEM_LIBTOMMATH),) + +define gb_LinkTarget__use_libtommath +$(call gb_LinkTarget_set_include,$(1),\ + $(LIBTOMMATH_CFLAGS) \ + $$(INCLUDE) \ +) +$(call gb_LinkTarget_add_libs,$(1),$(LIBTOMMATH_LIBS)) + +endef + +else # !SYSTEM_LIBTOMMATH +define gb_LinkTarget__use_libtommath +$(call gb_LinkTarget_set_include,$(1),\ + -I${WORKDIR}/UnpackedTarball/libtommath \ + $$(INCLUDE) \ +) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,libtommath)/libtommath$(gb_StaticLibrary_PLAINEXT) \ +) +$(call gb_LinkTarget_use_external_project,$(1),libtommath) + +endef + +endif # SYSTEM_LIBTOMMATH + +define gb_ExternalProject__use_libtommath +$(call gb_ExternalProject_use_external_project,$(1),libtommath) + +endef ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) @@ -2915,38 +2945,29 @@ $(call gb_LinkTarget_add_libs,$(1),$(FIREBIRD_LIBS)) endef -# gb_LinkTarget__use_atomic_ops := -# gb_LinkTarget__use_tommath := - else # !SYSTEM_FIREBIRD #$(call gb_LinkTarget__use_libatomic_ops,$(1)) +#$(call gb_LinkTarget__use_libtommath,$(1)) 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 \ $$(INCLUDE) \ - -I$(call gb_UnpackedTarball_get_dir,firebird)/gen/firebird/include \ ) ifeq ($(COM),MSC) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,firebird)/gen/firebird/bin/ifbembed.lib \ + $(call gb_UnpackedTarball_get_dir,firebird)/gen/Release/firebird/bin/ifbclient.lib \ ) else $(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,firebird)/gen/firebird/lib -lfbembed \ + -L$(call gb_UnpackedTarball_get_dir,firebird)/gen/Release/firebird/lib -lfbclient \ ) endif endef -# define gb_LinkTarget__use_tommath -# $(call gb_LinkTarget_set_include,$(1),\ -# $(TOMMATH_CFLAGS) \ -# $$(INCLUDE) \ -# ) - -# $(call gb_LinkTarget_add_libs,$(1),$(TOMMATH_LIBS)) # endef @@ -2956,7 +2977,7 @@ else # !ENABLE_FIREBIRD_SDBC gb_LinkTarget__use_firebird := # gb_LinkTarget__use_atomic_ops := -# gb_LinkTarget__use_tommath := +# gb_LinkTarget__use_libtommath := endif # ENABLE_FIREBIRD_SDBC |