RepositoryModule_host.mk | 1 external/Module_external.mk | 1 external/libmariadb/Makefile | 7 external/libmariadb/Module_libmariadb.mk | 17 external/libmariadb/StaticLibrary_mariadb.mk | 114 external/libmariadb/UnpackedTarball_mariadb.mk | 41 external/libmariadb/configs/linux_my_config.h | 297 external/libmariadb/configs/mac_my_config.h | 279 external/libmariadb/configs/mysql_version.h | 24 external/libmariadb/mariadb-msvc.patch.1 | 13 external/libmariadb/mariadb-static-inline.patch | 11 external/libmariadb/mariadb-swap.patch | 24 external/libmariadb/mariadb-thread.patch | 12 external/libmariadb/mariadb-trunk-40.patch |152418 ++++++++++++++++++++++++ libmariadb/Makefile | 7 libmariadb/Module_libmariadb.mk | 21 libmariadb/StaticLibrary_mariadb.mk | 114 libmariadb/UnpackedTarball_mariadb.mk | 41 libmariadb/configs/linux_my_config.h | 297 libmariadb/configs/mac_my_config.h | 279 libmariadb/configs/mysql_version.h | 24 libmariadb/mariadb-msvc.patch.1 | 13 libmariadb/mariadb-static-inline.patch | 11 libmariadb/mariadb-swap.patch | 24 libmariadb/mariadb-thread.patch | 12 libmariadb/mariadb-trunk-40.patch |152418 ------------------------ 26 files changed, 153258 insertions(+), 153262 deletions(-)
New commits: commit 9e89f7ccf873c14b425d37ef2e65bb7dfc75491e Author: Khaled Hosny <[email protected]> Date: Fri Oct 18 22:34:35 2013 +0200 fdo#70393: move libmariadb to a subdir of external Change-Id: I6c76056f5db2f523e49ffc79abad38a7eb1a06e4 Reviewed-on: https://gerrit.libreoffice.org/6342 Reviewed-by: David Tardon <[email protected]> Tested-by: David Tardon <[email protected]> diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index bf900b1..4164b9c 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -76,7 +76,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ linguistic \ lotuswordpro \ $(call gb_Helper_optional,DESKTOP,l10ntools) \ - $(call gb_Helper_optional,MARIADB,libmariadb) \ $(call gb_Helper_optional,MDDS,mdds) \ $(call gb_Helper_optional,MORE_FONTS,more_fonts) \ $(call gb_Helper_optional,MOZ,moz) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 9d24b23..92727a4 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,LIBXML2,libxml2) \ $(call gb_Helper_optional,LIBXSLT,libxslt) \ $(call gb_Helper_optional,LPSOLVE,lpsolve) \ + $(call gb_Helper_optional,MARIADB,libmariadb) \ $(call gb_Helper_optional,MSPUB,libmspub) \ $(call gb_Helper_optional,MWAW,libmwaw) \ $(call gb_Helper_optional,ODFGEN,libodfgen) \ diff --git a/libmariadb/Makefile b/external/libmariadb/Makefile similarity index 71% rename from libmariadb/Makefile rename to external/libmariadb/Makefile index ccb1c85..e4968cf 100644 --- a/libmariadb/Makefile +++ b/external/libmariadb/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/libmariadb/Module_libmariadb.mk b/external/libmariadb/Module_libmariadb.mk similarity index 93% rename from libmariadb/Module_libmariadb.mk rename to external/libmariadb/Module_libmariadb.mk index 09c726d..accee3f 100644 --- a/libmariadb/Module_libmariadb.mk +++ b/external/libmariadb/Module_libmariadb.mk @@ -9,13 +9,9 @@ $(eval $(call gb_Module_Module,libmariadb)) -ifeq ($(SYSTEM_MARIADB),NO) - $(eval $(call gb_Module_add_targets,libmariadb,\ StaticLibrary_mariadb \ UnpackedTarball_mariadb \ )) -endif - # vim: set noet sw=4 ts=4: diff --git a/libmariadb/StaticLibrary_mariadb.mk b/external/libmariadb/StaticLibrary_mariadb.mk similarity index 100% rename from libmariadb/StaticLibrary_mariadb.mk rename to external/libmariadb/StaticLibrary_mariadb.mk diff --git a/libmariadb/UnpackedTarball_mariadb.mk b/external/libmariadb/UnpackedTarball_mariadb.mk similarity index 73% rename from libmariadb/UnpackedTarball_mariadb.mk rename to external/libmariadb/UnpackedTarball_mariadb.mk index ce0bd9f..a198440 100644 --- a/libmariadb/UnpackedTarball_mariadb.mk +++ b/external/libmariadb/UnpackedTarball_mariadb.mk @@ -11,13 +11,13 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mariadb)) $(eval $(call gb_UnpackedTarball_set_tarball,mariadb,$(MARIADB_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_file,mariadb,include/mysql_version.h,libmariadb/configs/mysql_version.h)) +$(eval $(call gb_UnpackedTarball_add_file,mariadb,include/mysql_version.h,external/libmariadb/configs/mysql_version.h)) ifneq ($(OS),WNT) ifeq ($(OS),MACOSX) -$(eval $(call gb_UnpackedTarball_add_file,mariadb,include/my_config.h,libmariadb/configs/mac_my_config.h)) +$(eval $(call gb_UnpackedTarball_add_file,mariadb,include/my_config.h,external/libmariadb/configs/mac_my_config.h)) else -$(eval $(call gb_UnpackedTarball_add_file,mariadb,include/my_config.h,libmariadb/configs/linux_my_config.h)) +$(eval $(call gb_UnpackedTarball_add_file,mariadb,include/my_config.h,external/libmariadb/configs/linux_my_config.h)) endif endif # $(OS),WNT @@ -27,11 +27,11 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb,1)) # <https://mariadb.atlassian.net/browse/CONC-18> "no external definition of # non-static inline local_thr_alarm in libmariadb/net.c": $(eval $(call gb_UnpackedTarball_add_patches,mariadb,\ - libmariadb/mariadb-thread.patch \ - libmariadb/mariadb-swap.patch \ - libmariadb/mariadb-trunk-40.patch \ - libmariadb/mariadb-static-inline.patch \ - libmariadb/mariadb-msvc.patch.1 \ + external/libmariadb/mariadb-thread.patch \ + external/libmariadb/mariadb-swap.patch \ + external/libmariadb/mariadb-trunk-40.patch \ + external/libmariadb/mariadb-static-inline.patch \ + external/libmariadb/mariadb-msvc.patch.1 \ )) $(eval $(call gb_UnpackedTarball_fix_end_of_line,mariadb,\ diff --git a/libmariadb/configs/linux_my_config.h b/external/libmariadb/configs/linux_my_config.h similarity index 100% rename from libmariadb/configs/linux_my_config.h rename to external/libmariadb/configs/linux_my_config.h diff --git a/libmariadb/configs/mac_my_config.h b/external/libmariadb/configs/mac_my_config.h similarity index 100% rename from libmariadb/configs/mac_my_config.h rename to external/libmariadb/configs/mac_my_config.h diff --git a/libmariadb/configs/mysql_version.h b/external/libmariadb/configs/mysql_version.h similarity index 100% rename from libmariadb/configs/mysql_version.h rename to external/libmariadb/configs/mysql_version.h diff --git a/libmariadb/mariadb-msvc.patch.1 b/external/libmariadb/mariadb-msvc.patch.1 similarity index 100% rename from libmariadb/mariadb-msvc.patch.1 rename to external/libmariadb/mariadb-msvc.patch.1 diff --git a/libmariadb/mariadb-static-inline.patch b/external/libmariadb/mariadb-static-inline.patch similarity index 100% rename from libmariadb/mariadb-static-inline.patch rename to external/libmariadb/mariadb-static-inline.patch diff --git a/libmariadb/mariadb-swap.patch b/external/libmariadb/mariadb-swap.patch similarity index 100% rename from libmariadb/mariadb-swap.patch rename to external/libmariadb/mariadb-swap.patch diff --git a/libmariadb/mariadb-thread.patch b/external/libmariadb/mariadb-thread.patch similarity index 100% rename from libmariadb/mariadb-thread.patch rename to external/libmariadb/mariadb-thread.patch diff --git a/libmariadb/mariadb-trunk-40.patch b/external/libmariadb/mariadb-trunk-40.patch similarity index 100% rename from libmariadb/mariadb-trunk-40.patch rename to external/libmariadb/mariadb-trunk-40.patch _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
