diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-06-14 14:55:22 +0100 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-16 16:40:09 +0200 |
| commit | 0f16fa0fa58180a79aa5d27b44dbab4f9b6374b4 (patch) | |
| tree | a0be4bc4f6fa6788fd239acf8ef356794a26a81f /RepositoryExternal.mk | |
| parent | 8c325831b36394fa9217e30c706f36dc6ac7fafc (diff) | |
Build firebird 2.5 internally. Also adds libatomic_ops.
Change-Id: I44a45e781dfb3624cdebf4530ae44870bf39a82a
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 77 |
1 files changed, 55 insertions, 22 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 6b11281aef82..1a0a157d4629 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -653,6 +653,48 @@ gb_LinkTarget__use_jawt := endif # $(OS)$(COM) = WNTGCC +ifeq ($(SYSTEM_LIBATOMIC_OPS),YES) + +define gb_LinkTarget__use_libatomic_ops +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(LIBATOMIC_OPS_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1), $(LIBATOMIC_OPS_LIBS)) + +endef +gb_ExternalProject__use_libatomic_ops := + +else # !SYSTEM_LIBATOMIC_OPS + +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ + libatomic-ops-7.2d \ +)) + + +define gb_LinkTarget__use_libatomic_ops +$(call gb_LinkTarget_set_include,$(1),\ +$(LIBATOMIC_OPS_CFLAGS) \ + $$(INCLUDE) \ + $(LIBATOMIC_OPS_CFLAGS) \ +) +$(call gb_LinkTarget_use_package,$(1),\ + libatomic_ops \ +) +$(call gb_LinkTarget_use_static_libraries,$(1),\ + libatomic_ops \ +) + +endef + +define gb_ExternalProject__use_libatomic_ops +$(call gb_ExternalProject_use_package,$(1),libatomic_ops) + +endef + +endif # SYSTEM_LIBATOMIC_OPS + + ifeq ($(SYSTEM_LIBEXTTEXTCAT),YES) define gb_LinkTarget__use_libexttextcat @@ -2052,6 +2094,8 @@ ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) ifeq ($(SYSTEM_FIREBIRD),YES) +$(call gb_LinkTarget__use_libatomic_ops,$(1)) + define gb_LinkTarget__use_firebird $(call gb_LinkTarget_set_include,$(1),\ $(FIREBIRD_CFLAGS) \ @@ -2066,37 +2110,26 @@ endef else # !SYSTEM_FIREBIRD -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - firebird \ +#$(call gb_LinkTarget__use_libatomic_ops,$(1)) + +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + fbembed \ )) -define gb_LinkTarget__use_firebird -$(call gb_LinkTarget_use_unpacked,$(1),firebird) + +define gb_LinkTarget__use_libfbembed +$(call gb_LinkTarget_use_package,$(1),firebird) $(call gb_LinkTarget_set_include,$(1),\ - -I$(OUTDIR)/inc/external/firebird \ $$(INCLUDE) \ + -I$(call gb_UnpackedTarball_get_dir,firebird)/src/include \ + -I$(call gb_UnpackedTarball_get_dir,firebird)/src/include/gen \ + -I$(call gb_UnpackedTarball_get_dir,firebird)/src/jrd \ ) $(call gb_LinkTarget_use_libraries,$(1),\ - firebird \ + fbembed \ ) endef -# $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ -# atomic_ops \ -# )) - -# define gb_LinkTarget__use_atomic_ops -# $(call gb_LinkTarget_use_static_libraries,$(1),\ -# atomic_ops \ -# ) - -# endef -# define gb_ExternalProject__use_atomic_ops -# $(call gb_ExternalProject_use_package,$(1),atomic_ops) -# $(call gb_ExternalProject_use_static_libraries,$(1),atomic_ops) - -# endef - # define gb_LinkTarget__use_tommath # $(call gb_LinkTarget_set_include,$(1),\ # $(TOMMATH_CFLAGS) \ |