Kaydet (Commit) 9e89f7cc authored tarafından Khaled Hosny's avatar Khaled Hosny Kaydeden (comit) David Tardon

fdo#70393: move libmariadb to a subdir of external

Change-Id: I6c76056f5db2f523e49ffc79abad38a7eb1a06e4
Reviewed-on: https://gerrit.libreoffice.org/6342Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst 79832d92
......@@ -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) \
......
......@@ -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) \
......
......@@ -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:
......@@ -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:
......@@ -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,\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment