diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-18 19:58:14 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-10-19 07:34:56 +0000 |
commit | fc26490252a63b851560be0af97e14b784a20350 (patch) | |
tree | 43d01fdd4283e8f25589b3fe777c3d7cbecaba51 | |
parent | 36b554e96541f39ecc80b8ede3e260e3426a1936 (diff) |
fdo#70393: move liblangtag to a subdir of external
Change-Id: I18cded289591bdf872c7a818326a35ac00d38482
Reviewed-on: https://gerrit.libreoffice.org/6330
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
-rw-r--r-- | RepositoryModule_build.mk | 1 | ||||
-rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
-rw-r--r-- | external/Module_external.mk | 1 | ||||
-rw-r--r-- | external/liblangtag/ExternalPackage_langtag_data.mk (renamed from liblangtag/ExternalPackage_langtag_data.mk) | 0 | ||||
-rw-r--r-- | external/liblangtag/ExternalPackage_liblangtag_data.mk (renamed from liblangtag/ExternalPackage_liblangtag_data.mk) | 0 | ||||
-rw-r--r-- | external/liblangtag/ExternalProject_langtag.mk (renamed from liblangtag/ExternalProject_langtag.mk) | 0 | ||||
-rw-r--r-- | external/liblangtag/Makefile (renamed from liblangtag/Makefile) | 2 | ||||
-rw-r--r-- | external/liblangtag/Module_liblangtag.mk (renamed from liblangtag/Module_liblangtag.mk) | 5 | ||||
-rw-r--r-- | external/liblangtag/README (renamed from liblangtag/README) | 0 | ||||
-rw-r--r-- | external/liblangtag/UnpackedTarball_langtag.mk | 34 | ||||
-rw-r--r-- | external/liblangtag/liblangtag-0.5.1-mingw.patch (renamed from liblangtag/liblangtag-0.5.1-mingw.patch) | 0 | ||||
-rw-r--r-- | external/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch (renamed from liblangtag/liblangtag-0.5.1-msvc-snprintf.patch) | 0 | ||||
-rw-r--r-- | external/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch (renamed from liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch) | 0 | ||||
-rw-r--r-- | external/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch (renamed from liblangtag/liblangtag-0.5.1-msvc-strtoull.patch) | 0 | ||||
-rw-r--r-- | external/liblangtag/liblangtag-0.5.1-msvc-warning.patch (renamed from liblangtag/liblangtag-0.5.1-msvc-warning.patch) | 0 | ||||
-rw-r--r-- | external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch (renamed from liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch) | 0 | ||||
-rw-r--r-- | external/liblangtag/liblangtag-0.5.1-scope-declaration.patch (renamed from liblangtag/liblangtag-0.5.1-scope-declaration.patch) | 0 | ||||
-rw-r--r-- | external/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch (renamed from liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch) | 0 | ||||
-rw-r--r-- | external/liblangtag/liblangtag-0.5.1-unistd.patch (renamed from liblangtag/liblangtag-0.5.1-unistd.patch) | 0 | ||||
-rw-r--r-- | external/liblangtag/liblangtag-0.5.1-vsnprintf.patch (renamed from liblangtag/liblangtag-0.5.1-vsnprintf.patch) | 0 | ||||
-rw-r--r-- | external/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch (renamed from liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch) | 0 | ||||
-rw-r--r-- | liblangtag/UnpackedTarball_langtag.mk | 34 |
22 files changed, 36 insertions, 42 deletions
diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk index aa1585373383..70cf74fb9799 100644 --- a/RepositoryModule_build.mk +++ b/RepositoryModule_build.mk @@ -87,7 +87,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\ helpcompiler \ xmlhelp \ ) \ - $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ $(call gb_Helper_optional,LIBXML2,libxml2) \ $(call gb_Helper_optional,LIBXSLT,libxslt) \ $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 706a9e92038f..7a2acad849c2 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -70,7 +70,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ jvmaccess \ jvmfwk \ $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ - $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ $(call gb_Helper_optional,MSPUB,libmspub) \ $(call gb_Helper_optional,MWAW,libmwaw) \ $(call gb_Helper_optional,ODFGEN,libodfgen) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 3e4326e8b130..30249aa67e7f 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,LCMS2,lcms2) \ $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ + $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ $(call gb_Helper_optional,LIBPNG,libpng) \ )) diff --git a/liblangtag/ExternalPackage_langtag_data.mk b/external/liblangtag/ExternalPackage_langtag_data.mk index 3435e7080e1c..3435e7080e1c 100644 --- a/liblangtag/ExternalPackage_langtag_data.mk +++ b/external/liblangtag/ExternalPackage_langtag_data.mk diff --git a/liblangtag/ExternalPackage_liblangtag_data.mk b/external/liblangtag/ExternalPackage_liblangtag_data.mk index 0991d9621ea2..0991d9621ea2 100644 --- a/liblangtag/ExternalPackage_liblangtag_data.mk +++ b/external/liblangtag/ExternalPackage_liblangtag_data.mk diff --git a/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk index 23619ed3b2de..23619ed3b2de 100644 --- a/liblangtag/ExternalProject_langtag.mk +++ b/external/liblangtag/ExternalProject_langtag.mk diff --git a/liblangtag/Makefile b/external/liblangtag/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/liblangtag/Makefile +++ b/external/liblangtag/Makefile @@ -2,6 +2,6 @@ module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -include $(module_directory)/../solenv/gbuild/partial_build.mk +include $(module_directory)/../../solenv/gbuild/partial_build.mk # vim: set noet sw=4 ts=4: diff --git a/liblangtag/Module_liblangtag.mk b/external/liblangtag/Module_liblangtag.mk index a1bcdab62748..54827d2e9330 100644 --- a/liblangtag/Module_liblangtag.mk +++ b/external/liblangtag/Module_liblangtag.mk @@ -9,16 +9,11 @@ $(eval $(call gb_Module_Module,liblangtag)) -ifeq ($(ENABLE_LIBLANGTAG),TRUE) -ifeq ($(SYSTEM_LIBLANGTAG),NO) - $(eval $(call gb_Module_add_targets,liblangtag,\ UnpackedTarball_langtag \ ExternalPackage_langtag_data \ ExternalProject_langtag \ ExternalPackage_liblangtag_data \ )) -endif -endif # vim: set noet sw=4 ts=4: diff --git a/liblangtag/README b/external/liblangtag/README index 694daee093e6..694daee093e6 100644 --- a/liblangtag/README +++ b/external/liblangtag/README diff --git a/external/liblangtag/UnpackedTarball_langtag.mk b/external/liblangtag/UnpackedTarball_langtag.mk new file mode 100644 index 000000000000..88f7f167b437 --- /dev/null +++ b/external/liblangtag/UnpackedTarball_langtag.mk @@ -0,0 +1,34 @@ +# -*- 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,langtag)) + +$(eval $(call gb_UnpackedTarball_set_tarball,langtag,$(LIBLANGTAG_TARBALL),,liblangtag)) + +$(eval $(call gb_UnpackedTarball_add_patches,langtag,\ + external/liblangtag/liblangtag-0.5.1-msvc-warning.patch \ + external/liblangtag/liblangtag-0.5.1-vsnprintf.patch \ + external/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch \ + external/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch \ + external/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch \ + external/liblangtag/liblangtag-0.5.1-scope-declaration.patch \ + external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch \ + external/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch \ + external/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch \ + external/liblangtag/liblangtag-0.5.1-unistd.patch \ +)) + +ifeq ($(OS),WNT) +ifeq ($(COM),GCC) +$(eval $(call gb_UnpackedTarball_add_patches,langtag,\ + external/liblangtag/liblangtag-0.5.1-mingw.patch \ +)) +endif +endif +# vim: set noet sw=4 ts=4: diff --git a/liblangtag/liblangtag-0.5.1-mingw.patch b/external/liblangtag/liblangtag-0.5.1-mingw.patch index 54790e99a0c7..54790e99a0c7 100644 --- a/liblangtag/liblangtag-0.5.1-mingw.patch +++ b/external/liblangtag/liblangtag-0.5.1-mingw.patch diff --git a/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch b/external/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch index 61067e21b407..61067e21b407 100644 --- a/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch +++ b/external/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch diff --git a/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch b/external/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch index 84774c18d657..84774c18d657 100644 --- a/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch +++ b/external/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch diff --git a/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch b/external/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch index e50dddb76c0a..e50dddb76c0a 100644 --- a/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch +++ b/external/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch diff --git a/liblangtag/liblangtag-0.5.1-msvc-warning.patch b/external/liblangtag/liblangtag-0.5.1-msvc-warning.patch index 2d34fe8f0941..2d34fe8f0941 100644 --- a/liblangtag/liblangtag-0.5.1-msvc-warning.patch +++ b/external/liblangtag/liblangtag-0.5.1-msvc-warning.patch diff --git a/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch b/external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch index 1c9ac14077dd..1c9ac14077dd 100644 --- a/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch +++ b/external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch diff --git a/liblangtag/liblangtag-0.5.1-scope-declaration.patch b/external/liblangtag/liblangtag-0.5.1-scope-declaration.patch index 69bc434b46da..69bc434b46da 100644 --- a/liblangtag/liblangtag-0.5.1-scope-declaration.patch +++ b/external/liblangtag/liblangtag-0.5.1-scope-declaration.patch diff --git a/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch b/external/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch index 3cee1458ab7e..3cee1458ab7e 100644 --- a/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch +++ b/external/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch diff --git a/liblangtag/liblangtag-0.5.1-unistd.patch b/external/liblangtag/liblangtag-0.5.1-unistd.patch index 0aebe0b09cda..0aebe0b09cda 100644 --- a/liblangtag/liblangtag-0.5.1-unistd.patch +++ b/external/liblangtag/liblangtag-0.5.1-unistd.patch diff --git a/liblangtag/liblangtag-0.5.1-vsnprintf.patch b/external/liblangtag/liblangtag-0.5.1-vsnprintf.patch index 599c47f9ae52..599c47f9ae52 100644 --- a/liblangtag/liblangtag-0.5.1-vsnprintf.patch +++ b/external/liblangtag/liblangtag-0.5.1-vsnprintf.patch diff --git a/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch b/external/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch index cc0e4abaed59..cc0e4abaed59 100644 --- a/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch +++ b/external/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch diff --git a/liblangtag/UnpackedTarball_langtag.mk b/liblangtag/UnpackedTarball_langtag.mk deleted file mode 100644 index b7c80b091a35..000000000000 --- a/liblangtag/UnpackedTarball_langtag.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -*- 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,langtag)) - -$(eval $(call gb_UnpackedTarball_set_tarball,langtag,$(LIBLANGTAG_TARBALL),,liblangtag)) - -$(eval $(call gb_UnpackedTarball_add_patches,langtag,\ - liblangtag/liblangtag-0.5.1-msvc-warning.patch \ - liblangtag/liblangtag-0.5.1-vsnprintf.patch \ - liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch \ - liblangtag/liblangtag-0.5.1-msvc-snprintf.patch \ - liblangtag/liblangtag-0.5.1-msvc-strtoull.patch \ - liblangtag/liblangtag-0.5.1-scope-declaration.patch \ - liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch \ - liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch \ - liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch \ - liblangtag/liblangtag-0.5.1-unistd.patch \ -)) - -ifeq ($(OS),WNT) -ifeq ($(COM),GCC) -$(eval $(call gb_UnpackedTarball_add_patches,langtag,\ - liblangtag/liblangtag-0.5.1-mingw.patch \ -)) -endif -endif -# vim: set noet sw=4 ts=4: |