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 /libatomic_ops | |
parent | 8c325831b36394fa9217e30c706f36dc6ac7fafc (diff) |
Build firebird 2.5 internally. Also adds libatomic_ops.
Change-Id: I44a45e781dfb3624cdebf4530ae44870bf39a82a
Diffstat (limited to 'libatomic_ops')
-rw-r--r-- | libatomic_ops/ExternalPackage_libatomic_ops.mk | 20 | ||||
-rw-r--r-- | libatomic_ops/ExternalProject_libatomic_ops.mk | 26 | ||||
-rw-r--r-- | libatomic_ops/Makefile | 7 | ||||
-rw-r--r-- | libatomic_ops/Module_libatomic_ops.mk | 22 | ||||
-rw-r--r-- | libatomic_ops/README | 4 | ||||
-rw-r--r-- | libatomic_ops/UnpackedTarball_libatomic_ops.mk | 14 |
6 files changed, 93 insertions, 0 deletions
diff --git a/libatomic_ops/ExternalPackage_libatomic_ops.mk b/libatomic_ops/ExternalPackage_libatomic_ops.mk new file mode 100644 index 000000000000..a7615f6ca83b --- /dev/null +++ b/libatomic_ops/ExternalPackage_libatomic_ops.mk @@ -0,0 +1,20 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,libatomic_ops,libatomic_ops)) + +$(eval $(call gb_ExternalPackage_use_external_project,libatomic_ops,libatomic_ops)) + +ifeq ($(OS)$(COM),WNTMSC) +$(eval $(call gb_ExternalPackage_add_file,libatomic_ops,lib/atomic_ops-7.2d.lib,src/lib/.libs/libatomic_ops-7.2d.lib)) +else +$(eval $(call gb_ExternalPackage_add_file,libatomic_ops,lib/libatomic_ops-7.2d.a,src/lib/.libs/libatomic_ops-7.2d.a)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/libatomic_ops/ExternalProject_libatomic_ops.mk b/libatomic_ops/ExternalProject_libatomic_ops.mk new file mode 100644 index 000000000000..06ec521c615d --- /dev/null +++ b/libatomic_ops/ExternalProject_libatomic_ops.mk @@ -0,0 +1,26 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalProject_ExternalProject,libatomic_ops)) + +$(eval $(call gb_ExternalProject_use_autoconf,libatomic_ops,build)) + +$(eval $(call gb_ExternalProject_register_targets,libatomic_ops,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,libatomic_ops,build) : + $(call gb_ExternalProject_run,build,\ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)") \ + ./configure \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && $(MAKE) \ + ) + +# vim: set noet sw=4 ts=4: diff --git a/libatomic_ops/Makefile b/libatomic_ops/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/libatomic_ops/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/libatomic_ops/Module_libatomic_ops.mk b/libatomic_ops/Module_libatomic_ops.mk new file mode 100644 index 000000000000..dbbf39bcd2f1 --- /dev/null +++ b/libatomic_ops/Module_libatomic_ops.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,libatomic_ops)) + +ifeq ($(SYSTEM_ATOMIC_OPS),NO) + +$(eval $(call gb_Module_add_targets,libatomic_ops,\ + ExternalProject_libatomic_ops \ + ExternalPackage_libatomic_ops \ + UnpackedTarball_libatomic_ops \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/libatomic_ops/README b/libatomic_ops/README new file mode 100644 index 000000000000..61255d7c8e05 --- /dev/null +++ b/libatomic_ops/README @@ -0,0 +1,4 @@ +From [https://github.com/ivmai/libatomic_ops/]. + +Note that some files (linked into libatomic_ops_gpl) are GPL'd, the portion +needed for Firebird (ibatomic_ops) is however MIT licensed. diff --git a/libatomic_ops/UnpackedTarball_libatomic_ops.mk b/libatomic_ops/UnpackedTarball_libatomic_ops.mk new file mode 100644 index 000000000000..602c483f3efc --- /dev/null +++ b/libatomic_ops/UnpackedTarball_libatomic_ops.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,libatomic_ops)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libatomic_ops,$(LIBATOMIC_OPS_TARBALL))) + +# vim: set noet sw=4 ts=4: |