diff options
Diffstat (limited to 'firebird')
| -rw-r--r-- | firebird/ExternalPackage_firebird.mk | 15 | ||||
| -rw-r--r-- | firebird/ExternalProject_firebird.mk | 16 | ||||
| -rw-r--r-- | firebird/Module_firebird.mk | 4 |
3 files changed, 12 insertions, 23 deletions
diff --git a/firebird/ExternalPackage_firebird.mk b/firebird/ExternalPackage_firebird.mk index d02037d46183..c385b59c15d9 100644 --- a/firebird/ExternalPackage_firebird.mk +++ b/firebird/ExternalPackage_firebird.mk @@ -11,12 +11,12 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,firebird,firebird)) $(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,firebird,inc/external/firebird,\ - gen/firebird/include/ib_util.h \ - gen/firebird/include/ibase.h \ - gen/firebird/include/iberror.h \ - gen/firebird/include/perf.h \ -)) +#$(eval $(call gb_ExternalPackage_add_unpacked_files,firebird,inc/external/firebird,\ +# gen/firebird/include/ib_util.h \ +# gen/firebird/include/ibase.h \ +# gen/firebird/include/iberror.h \ +# gen/firebird/include/perf.h \ +#)) # Need to be added? # $(eval $(call gb_ExternalPackage_add_unpacked_files,firebird,share/firebird,\ @@ -39,8 +39,9 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,firebird,inc/external/firebi # gen/firebird/security2.fdb \ # )) -$(eval $(call gb_ExternalPackage_add_library_for_install,firebird,lib/libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2)) $(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2)) +$(eval $(call gb_ExternalPackage_add_library_for_install,firebird,lib/libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2)) +$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so,gen/firebird/lib/libfbembed.so.2.5.2)) # vim: set noet sw=4 ts=4: diff --git a/firebird/ExternalProject_firebird.mk b/firebird/ExternalProject_firebird.mk index 231759b81dbd..903e5c64999b 100644 --- a/firebird/ExternalProject_firebird.mk +++ b/firebird/ExternalProject_firebird.mk @@ -9,20 +9,14 @@ $(eval $(call gb_ExternalProject_ExternalProject,firebird)) -$(eval $(call gb_ExternalProject_use_unpacked,firebird,firebird)) - $(eval $(call gb_ExternalProject_use_autoconf,firebird,build)) $(eval $(call gb_ExternalProject_use_externals,firebird,\ boost_headers \ icu \ + libatomic_ops \ )) -# Dependency in 2.5 -# $(eval $(call gb_ExternalProject_use_packages,firebird, \ -# atomic_op \ -# )) - # Dependency in 3.0 # $(eval $(call gb_ExternalProject_use_packages,firebird, \ # tommath \ @@ -37,18 +31,14 @@ $(eval $(call gb_ExternalProject_register_targets,firebird,\ $(call gb_ExternalProject_get_state_target,firebird,build): $(call gb_ExternalProject_run,build,\ + unset MAKEFLAGS && \ export CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \ - && export LDFLAGS="-L$(OUTDIR)/lib \ + && LDFLAGS="-L$(OUTDIR)/lib \ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \ $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ && CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \ - && export ICU_LIBS=" " \ - && export ICU_CFLAGS="$(if $(filter NO,$(SYSTEM_ICU)),\ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/common, )" \ && export PKG_CONFIG="" \ && ./configure \ - --with-system-icu \ --without-editline \ --disable-superserver \ $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost),CXXFLAGS=$(BOOST_CPPFLAGS)) \ diff --git a/firebird/Module_firebird.mk b/firebird/Module_firebird.mk index 7c8fca0b02ee..1e8706770fd5 100644 --- a/firebird/Module_firebird.mk +++ b/firebird/Module_firebird.mk @@ -10,13 +10,11 @@ $(eval $(call gb_Module_Module,firebird)) ifeq ($(SYSTEM_FIREBIRD),NO) -$(eval $(call gb_Module_add_targets,firebird,\ - UnpackedTarball_firebird \ -)) $(eval $(call gb_Module_add_targets,firebird,\ ExternalPackage_firebird \ ExternalProject_firebird \ + UnpackedTarball_firebird \ )) endif |