Kaydet (Commit) 871d75e9 authored tarafından Michael Stahl's avatar Michael Stahl

consistent naming of externals: libmariadb -> mariadb-connector-c

The used version is actually named mariadb_client but since 2.1.0
upstream calls it MariaDB Connector/C.

Change-Id: I51b12a9be55151919585dec91a5fc802ff4fc86b
Reviewed-on: https://gerrit.libreoffice.org/42295Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
Tested-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 0bb76485
......@@ -164,7 +164,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
LIBXMLSEC_TARBALL \
$(call fetch_Optional,LIBXSLT,LIBXSLT_TARBALL) \
$(call fetch_Optional,LPSOLVE,LPSOLVE_TARBALL) \
$(call fetch_Optional,MARIADB,MARIADB_TARBALL) \
$(call fetch_Optional,MARIADB_CONNECTOR_C,MARIADB_CONNECTOR_C_TARBALL) \
$(call fetch_Optional,MDDS,MDDS_TARBALL) \
$(call fetch_Optional,MDNSRESPONDER,MDNSRESPONDER_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_CALADEA_TARBALL) \
......
......@@ -226,9 +226,9 @@ $(call gb_LinkTarget_add_libs,$(1),-liconv)
endef
ifneq ($(SYSTEM_MARIADB),)
ifneq ($(SYSTEM_MARIADB_CONNECTOR_C),)
define gb_LinkTarget__use_mariadb
define gb_LinkTarget__use_mariadb-connector-c
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(MARIADB_CFLAGS) \
......@@ -236,29 +236,29 @@ $(call gb_LinkTarget_set_include,$(1),\
$(call gb_LinkTarget_add_libs,$(1),$(MARIADB_LIBS))
endef
gb_ExternalProject__use_mariadb :=
gb_ExternalProject__use_mariadb-connector-c :=
else # !SYSTEM_MARIADB
else # !SYSTEM_MARIADB_CONNECTOR_C
define gb_LinkTarget__use_mariadb
define gb_LinkTarget__use_mariadb-connector-c
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(MARIADB_CFLAGS) \
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
mariadblib \
mariadb-connector-c \
)
endef
define gb_ExternalProject__use_mariadb
$(call gb_ExternalProject_use_static_libraries,$(1),mariadblib)
define gb_ExternalProject__use_mariadb-connector-c
$(call gb_ExternalProject_use_static_libraries,$(1),mariadb-connector-c)
endef
endif # SYSTEM_MARIADB
endif # SYSTEM_MARIADB_CONNECTOR_C
ifneq ($(SYSTEM_MARIADB),)
ifneq ($(SYSTEM_MARIADB_CONNECTOR_C),)
define gb_LinkTarget__use_mysql
......
......@@ -374,7 +374,7 @@ export MARIADB_CFLAGS=$(gb_SPACE)@MARIADB_CFLAGS@
export MARIADB_LIBS=$(gb_SPACE)@MARIADB_LIBS@
export LIBMARIADB=@LIBMARIADB@
export LIBMARIADB_PATH=@LIBMARIADB_PATH@
export BUNDLE_MARIADB=@BUNDLE_MARIADB@
export BUNDLE_MARIADB_CONNECTOR_C=@BUNDLE_MARIADB_CONNECTOR_C@
export MDDS_CFLAGS=$(gb_SPACE)@MDDS_CFLAGS@
export MDDS_LIBS=$(gb_SPACE)@MDDS_LIBS@
export MERGELIBS=@MERGELIBS@
......@@ -539,7 +539,7 @@ export SYSTEM_LIBXSLT=@SYSTEM_LIBXSLT@
export SYSTEM_LIBXSLT_FOR_BUILD=@SYSTEM_LIBXSLT_FOR_BUILD@
export SYSTEM_LPSOLVE=@SYSTEM_LPSOLVE@
export SYSTEM_MDDS=@SYSTEM_MDDS@
export SYSTEM_MARIADB=@SYSTEM_MARIADB@
export SYSTEM_MARIADB_CONNECTOR_C=@SYSTEM_MARIADB_CONNECTOR_C@
export SYSTEM_MSPUB=@SYSTEM_MSPUB@
export SYSTEM_MWAW=@SYSTEM_MWAW@
export SYSTEM_MYSQL_CPPCONN=@SYSTEM_MYSQL_CPPCONN@
......
......@@ -8156,7 +8156,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
AC_MSG_CHECKING([which MariaDB to use])
if test "$with_system_mariadb" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_MARIADB=TRUE
SYSTEM_MARIADB_CONNECTOR_C=TRUE
#AC_PATH_PROG(MARIADBCONFIG, [mariadb_config])
if test -z "$MARIADBCONFIG"; then
AC_PATH_PROG(MARIADBCONFIG, [mysql_config])
......@@ -8193,7 +8193,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
AC_MSG_CHECKING([whether to bundle the MySQL/MariaDB client library])
if test "$enable_bundle_mariadb" = "yes"; then
AC_MSG_RESULT([yes])
BUNDLE_MARIADB=TRUE
BUNDLE_MARIADB_CONNECTOR_C=TRUE
LIBMARIADB=lib$(echo "${MARIADB_LIBS}" | sed -e 's/[[[:space:]]]\{1,\}-l\([[^[:space:]]]\{1,\}\)/\
\1\
/g' -e 's/^-l\([[^[:space:]]]\{1,\}\)[[[:space:]]]*/\
......@@ -8217,22 +8217,22 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
fi
else
AC_MSG_RESULT([no])
BUNDLE_MARIADB=
BUNDLE_MARIADB_CONNECTOR_C=
fi
else
AC_MSG_RESULT([internal])
SYSTEM_MARIADB=
MARIADB_CFLAGS="-I${WORKDIR}/UnpackedTarball/mariadb/include"
MARIADB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lmariadblib"
BUILD_TYPE="$BUILD_TYPE MARIADB"
SYSTEM_MARIADB_CONNECTOR_C=
MARIADB_CFLAGS="-I${WORKDIR}/UnpackedTarball/mariadb-connector-c/include"
MARIADB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lmariadb-connector-c"
BUILD_TYPE="$BUILD_TYPE MARIADB_CONNECTOR_C"
fi
AC_SUBST(SYSTEM_MARIADB)
AC_SUBST(SYSTEM_MARIADB_CONNECTOR_C)
AC_SUBST(MARIADB_CFLAGS)
AC_SUBST(MARIADB_LIBS)
AC_SUBST(LIBMARIADB)
AC_SUBST(LIBMARIADB_PATH)
AC_SUBST(BUNDLE_MARIADB)
AC_SUBST(BUNDLE_MARIADB_CONNECTOR_C)
AC_LANG_PUSH([C++])
dnl ===================================================================
......
......@@ -149,8 +149,8 @@ export LIBXSLT_SHA256SUM := ba65236116de8326d83378b2bd929879fa185195bc530b9d1aba
export LIBXSLT_TARBALL := libxslt-1.1.30.tar.gz
export LPSOLVE_SHA256SUM := 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
export MARIADB_SHA256SUM := fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60
export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
export MARIADB_CONNECTOR_C_SHA256SUM := fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60
export MARIADB_CONNECTOR_C_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
export MDDS_SHA256SUM := 402fec18256f95b89517d54d85f00bce1faa6e517cb3d7c98a720fddd063354f
export MDDS_TARBALL := mdds-1.2.3.tar.bz2
export MDNSRESPONDER_SHA256SUM := 4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0
......
......@@ -66,7 +66,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,LIBXSLT,libxslt) \
$(call gb_Helper_optional,LPSOLVE,lpsolve) \
$(call gb_Helper_optional,LIBTOMMATH,libtommath) \
$(call gb_Helper_optional,MARIADB,libmariadb) \
$(call gb_Helper_optional,MARIADB_CONNECTOR_C,mariadb-connector-c) \
$(call gb_Helper_optional,MDDS,mdds) \
$(call gb_Helper_optional,MDNSRESPONDER,mdnsresponder) \
$(if $(WITH_EXTRA_EXTENSIONS),misc_extensions) \
......
# -*- 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_StaticLibrary_StaticLibrary,mariadblib))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,mariadblib))
$(eval $(call gb_StaticLibrary_use_unpacked,mariadblib,mariadb))
$(eval $(call gb_StaticLibrary_set_include,mariadblib,\
$$(INCLUDE) \
-I$(call gb_UnpackedTarball_get_dir,mariadb)/include \
))
# This is needed for MSVC 2008: it somehow finds a dlopen somewhere
# but the static library then contains unreferenced symbols.
# This macro enables a re-definition to native Win32 APIs in my_global.h.
## TODO missing enable: -DHAVE_OPENSSL -D HAVE_COMPRESS
## (but then need to add "-lssl -lcrypto -lz" to mysqlcppconn linking)
$(eval $(call gb_StaticLibrary_add_cflags,mariadblib,-DHAVE_DLOPEN -D ENABLED_LOCAL_INFILE -D LIBMARIADB -D THREAD -DSQLITE_ENABLE_COLUMN_METADATA=1))
$(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadblib,\
UnpackedTarball/mariadb/libmariadb/array \
UnpackedTarball/mariadb/libmariadb/ma_dyncol \
UnpackedTarball/mariadb/libmariadb/bchange \
UnpackedTarball/mariadb/libmariadb/bmove \
UnpackedTarball/mariadb/libmariadb/bmove_upp \
UnpackedTarball/mariadb/libmariadb/my_charset \
UnpackedTarball/mariadb/libmariadb/hash \
UnpackedTarball/mariadb/libmariadb/violite \
UnpackedTarball/mariadb/libmariadb/net \
UnpackedTarball/mariadb/libmariadb/charset \
UnpackedTarball/mariadb/libmariadb/ma_time \
UnpackedTarball/mariadb/libmariadb/dbug \
UnpackedTarball/mariadb/libmariadb/default \
UnpackedTarball/mariadb/libmariadb/errmsg \
UnpackedTarball/mariadb/libmariadb/my_vsnprintf \
UnpackedTarball/mariadb/libmariadb/errors \
UnpackedTarball/mariadb/libmariadb/getopt1 \
UnpackedTarball/mariadb/libmariadb/getopt \
UnpackedTarball/mariadb/libmariadb/get_password \
UnpackedTarball/mariadb/libmariadb/int2str \
UnpackedTarball/mariadb/libmariadb/is_prefix \
UnpackedTarball/mariadb/libmariadb/libmariadb \
UnpackedTarball/mariadb/libmariadb/list \
UnpackedTarball/mariadb/libmariadb/llstr \
UnpackedTarball/mariadb/libmariadb/longlong2str \
UnpackedTarball/mariadb/libmariadb/mf_dirname \
UnpackedTarball/mariadb/libmariadb/mf_fn_ext \
UnpackedTarball/mariadb/libmariadb/mf_format \
UnpackedTarball/mariadb/libmariadb/mf_loadpath \
UnpackedTarball/mariadb/libmariadb/mf_pack \
UnpackedTarball/mariadb/libmariadb/mf_path \
UnpackedTarball/mariadb/libmariadb/mf_unixpath \
UnpackedTarball/mariadb/libmariadb/mf_wcomp \
UnpackedTarball/mariadb/libmariadb/mulalloc \
UnpackedTarball/mariadb/libmariadb/my_alloc \
UnpackedTarball/mariadb/libmariadb/my_compress \
UnpackedTarball/mariadb/libmariadb/my_div \
UnpackedTarball/mariadb/libmariadb/my_error \
UnpackedTarball/mariadb/libmariadb/my_fopen \
UnpackedTarball/mariadb/libmariadb/my_fstream \
UnpackedTarball/mariadb/libmariadb/my_getwd \
UnpackedTarball/mariadb/libmariadb/my_init \
UnpackedTarball/mariadb/libmariadb/my_lib \
UnpackedTarball/mariadb/libmariadb/my_malloc \
UnpackedTarball/mariadb/libmariadb/my_messnc \
UnpackedTarball/mariadb/libmariadb/my_net \
UnpackedTarball/mariadb/libmariadb/my_once \
UnpackedTarball/mariadb/libmariadb/my_open \
UnpackedTarball/mariadb/libmariadb/my_port \
UnpackedTarball/mariadb/libmariadb/my_pthread \
UnpackedTarball/mariadb/libmariadb/my_read \
UnpackedTarball/mariadb/libmariadb/my_realloc \
UnpackedTarball/mariadb/libmariadb/my_seek \
UnpackedTarball/mariadb/libmariadb/my_static \
UnpackedTarball/mariadb/libmariadb/my_symlink \
UnpackedTarball/mariadb/libmariadb/my_thr_init \
UnpackedTarball/mariadb/libmariadb/my_write \
UnpackedTarball/mariadb/libmariadb/password \
UnpackedTarball/mariadb/libmariadb/str2int \
UnpackedTarball/mariadb/libmariadb/strcend \
UnpackedTarball/mariadb/libmariadb/strcont \
UnpackedTarball/mariadb/libmariadb/strend \
UnpackedTarball/mariadb/libmariadb/strfill \
UnpackedTarball/mariadb/libmariadb/string \
UnpackedTarball/mariadb/libmariadb/strinstr \
UnpackedTarball/mariadb/libmariadb/strmake \
UnpackedTarball/mariadb/libmariadb/strmov \
UnpackedTarball/mariadb/libmariadb/strnmov \
UnpackedTarball/mariadb/libmariadb/strtoll \
UnpackedTarball/mariadb/libmariadb/strtoull \
UnpackedTarball/mariadb/libmariadb/strxmov \
UnpackedTarball/mariadb/libmariadb/strxnmov \
UnpackedTarball/mariadb/libmariadb/thr_mutex \
UnpackedTarball/mariadb/libmariadb/typelib \
UnpackedTarball/mariadb/libmariadb/sha1 \
UnpackedTarball/mariadb/libmariadb/my_stmt \
UnpackedTarball/mariadb/libmariadb/my_loaddata \
UnpackedTarball/mariadb/libmariadb/my_stmt_codec \
UnpackedTarball/mariadb/libmariadb/client_plugin \
UnpackedTarball/mariadb/libmariadb/my_auth \
UnpackedTarball/mariadb/libmariadb/ma_secure \
))
# vim: set noet sw=4 ts=4:
......@@ -7,11 +7,11 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Module_Module,libmariadb))
$(eval $(call gb_Module_Module,mariadb-connector-c))
$(eval $(call gb_Module_add_targets,libmariadb,\
StaticLibrary_mariadb \
UnpackedTarball_mariadb \
$(eval $(call gb_Module_add_targets,mariadb-connector-c,\
StaticLibrary_mariadb-connector-c \
UnpackedTarball_mariadb-connector-c \
))
# vim: set noet sw=4 ts=4:
# -*- 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_StaticLibrary_StaticLibrary,mariadb-connector-c))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,mariadb-connector-c))
$(eval $(call gb_StaticLibrary_use_unpacked,mariadb-connector-c,mariadb-connector-c))
$(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\
$$(INCLUDE) \
-I$(call gb_UnpackedTarball_get_dir,mariadb-connector-c)/include \
))
# This is needed for MSVC 2008: it somehow finds a dlopen somewhere
# but the static library then contains unreferenced symbols.
# This macro enables a re-definition to native Win32 APIs in my_global.h.
## TODO missing enable: -DHAVE_OPENSSL -D HAVE_COMPRESS
## (but then need to add "-lssl -lcrypto -lz" to mysqlcppconn linking)
$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-DHAVE_DLOPEN -D ENABLED_LOCAL_INFILE -D LIBMARIADB -D THREAD -DSQLITE_ENABLE_COLUMN_METADATA=1))
$(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/array \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_dyncol \
UnpackedTarball/mariadb-connector-c/libmariadb/bchange \
UnpackedTarball/mariadb-connector-c/libmariadb/bmove \
UnpackedTarball/mariadb-connector-c/libmariadb/bmove_upp \
UnpackedTarball/mariadb-connector-c/libmariadb/my_charset \
UnpackedTarball/mariadb-connector-c/libmariadb/hash \
UnpackedTarball/mariadb-connector-c/libmariadb/violite \
UnpackedTarball/mariadb-connector-c/libmariadb/net \
UnpackedTarball/mariadb-connector-c/libmariadb/charset \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_time \
UnpackedTarball/mariadb-connector-c/libmariadb/dbug \
UnpackedTarball/mariadb-connector-c/libmariadb/default \
UnpackedTarball/mariadb-connector-c/libmariadb/errmsg \
UnpackedTarball/mariadb-connector-c/libmariadb/my_vsnprintf \
UnpackedTarball/mariadb-connector-c/libmariadb/errors \
UnpackedTarball/mariadb-connector-c/libmariadb/getopt1 \
UnpackedTarball/mariadb-connector-c/libmariadb/getopt \
UnpackedTarball/mariadb-connector-c/libmariadb/get_password \
UnpackedTarball/mariadb-connector-c/libmariadb/int2str \
UnpackedTarball/mariadb-connector-c/libmariadb/is_prefix \
UnpackedTarball/mariadb-connector-c/libmariadb/libmariadb \
UnpackedTarball/mariadb-connector-c/libmariadb/list \
UnpackedTarball/mariadb-connector-c/libmariadb/llstr \
UnpackedTarball/mariadb-connector-c/libmariadb/longlong2str \
UnpackedTarball/mariadb-connector-c/libmariadb/mf_dirname \
UnpackedTarball/mariadb-connector-c/libmariadb/mf_fn_ext \
UnpackedTarball/mariadb-connector-c/libmariadb/mf_format \
UnpackedTarball/mariadb-connector-c/libmariadb/mf_loadpath \
UnpackedTarball/mariadb-connector-c/libmariadb/mf_pack \
UnpackedTarball/mariadb-connector-c/libmariadb/mf_path \
UnpackedTarball/mariadb-connector-c/libmariadb/mf_unixpath \
UnpackedTarball/mariadb-connector-c/libmariadb/mf_wcomp \
UnpackedTarball/mariadb-connector-c/libmariadb/mulalloc \
UnpackedTarball/mariadb-connector-c/libmariadb/my_alloc \
UnpackedTarball/mariadb-connector-c/libmariadb/my_compress \
UnpackedTarball/mariadb-connector-c/libmariadb/my_div \
UnpackedTarball/mariadb-connector-c/libmariadb/my_error \
UnpackedTarball/mariadb-connector-c/libmariadb/my_fopen \
UnpackedTarball/mariadb-connector-c/libmariadb/my_fstream \
UnpackedTarball/mariadb-connector-c/libmariadb/my_getwd \
UnpackedTarball/mariadb-connector-c/libmariadb/my_init \
UnpackedTarball/mariadb-connector-c/libmariadb/my_lib \
UnpackedTarball/mariadb-connector-c/libmariadb/my_malloc \
UnpackedTarball/mariadb-connector-c/libmariadb/my_messnc \
UnpackedTarball/mariadb-connector-c/libmariadb/my_net \
UnpackedTarball/mariadb-connector-c/libmariadb/my_once \
UnpackedTarball/mariadb-connector-c/libmariadb/my_open \
UnpackedTarball/mariadb-connector-c/libmariadb/my_port \
UnpackedTarball/mariadb-connector-c/libmariadb/my_pthread \
UnpackedTarball/mariadb-connector-c/libmariadb/my_read \
UnpackedTarball/mariadb-connector-c/libmariadb/my_realloc \
UnpackedTarball/mariadb-connector-c/libmariadb/my_seek \
UnpackedTarball/mariadb-connector-c/libmariadb/my_static \
UnpackedTarball/mariadb-connector-c/libmariadb/my_symlink \
UnpackedTarball/mariadb-connector-c/libmariadb/my_thr_init \
UnpackedTarball/mariadb-connector-c/libmariadb/my_write \
UnpackedTarball/mariadb-connector-c/libmariadb/password \
UnpackedTarball/mariadb-connector-c/libmariadb/str2int \
UnpackedTarball/mariadb-connector-c/libmariadb/strcend \
UnpackedTarball/mariadb-connector-c/libmariadb/strcont \
UnpackedTarball/mariadb-connector-c/libmariadb/strend \
UnpackedTarball/mariadb-connector-c/libmariadb/strfill \
UnpackedTarball/mariadb-connector-c/libmariadb/string \
UnpackedTarball/mariadb-connector-c/libmariadb/strinstr \
UnpackedTarball/mariadb-connector-c/libmariadb/strmake \
UnpackedTarball/mariadb-connector-c/libmariadb/strmov \
UnpackedTarball/mariadb-connector-c/libmariadb/strnmov \
UnpackedTarball/mariadb-connector-c/libmariadb/strtoll \
UnpackedTarball/mariadb-connector-c/libmariadb/strtoull \
UnpackedTarball/mariadb-connector-c/libmariadb/strxmov \
UnpackedTarball/mariadb-connector-c/libmariadb/strxnmov \
UnpackedTarball/mariadb-connector-c/libmariadb/thr_mutex \
UnpackedTarball/mariadb-connector-c/libmariadb/typelib \
UnpackedTarball/mariadb-connector-c/libmariadb/sha1 \
UnpackedTarball/mariadb-connector-c/libmariadb/my_stmt \
UnpackedTarball/mariadb-connector-c/libmariadb/my_loaddata \
UnpackedTarball/mariadb-connector-c/libmariadb/my_stmt_codec \
UnpackedTarball/mariadb-connector-c/libmariadb/client_plugin \
UnpackedTarball/mariadb-connector-c/libmariadb/my_auth \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_secure \
))
# vim: set noet sw=4 ts=4:
......@@ -7,30 +7,30 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_UnpackedTarball_UnpackedTarball,mariadb))
$(eval $(call gb_UnpackedTarball_UnpackedTarball,mariadb-connector-c))
$(eval $(call gb_UnpackedTarball_set_tarball,mariadb,$(MARIADB_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_tarball,mariadb-connector-c,$(MARIADB_CONNECTOR_C_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_file,mariadb,include/mysql_version.h,external/libmariadb/configs/mysql_version.h))
$(eval $(call gb_UnpackedTarball_add_file,mariadb-connector-c,include/mysql_version.h,external/mariadb-connector-c/configs/mysql_version.h))
ifneq ($(OS),WNT)
ifeq ($(OS),MACOSX)
$(eval $(call gb_UnpackedTarball_add_file,mariadb,include/my_config.h,external/libmariadb/configs/mac_my_config.h))
$(eval $(call gb_UnpackedTarball_add_file,mariadb-connector-c,include/my_config.h,external/mariadb-connector-c/configs/mac_my_config.h))
else
$(eval $(call gb_UnpackedTarball_add_file,mariadb,include/my_config.h,external/libmariadb/configs/linux_my_config.h))
$(eval $(call gb_UnpackedTarball_add_file,mariadb-connector-c,include/my_config.h,external/mariadb-connector-c/configs/linux_my_config.h))
endif
endif # $(OS),WNT
$(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb,1))
$(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb-connector-c,1))
# libmariadb/mariadb-static-inline.patch upstream at
# mariadb-connector-c/mariadb-static-inline.patch upstream at
# <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,\
external/libmariadb/mariadb-swap.patch \
$(if $(filter MSC,$(COM)),external/libmariadb/mariadb-msvc.patch.1) \
external/libmariadb/mariadb-inline.patch.1 \
external/libmariadb/mariadb-CONC-104.patch.1 \
$(eval $(call gb_UnpackedTarball_add_patches,mariadb-connector-c,\
external/mariadb-connector-c/mariadb-swap.patch \
$(if $(filter MSC,$(COM)),external/mariadb-connector-c/mariadb-msvc.patch.1) \
external/mariadb-connector-c/mariadb-inline.patch.1 \
external/mariadb-connector-c/mariadb-CONC-104.patch.1 \
))
# vim: set noet sw=4 ts=4:
......@@ -13,7 +13,7 @@ $(eval $(call gb_Library_use_unpacked,mysqlcppconn,mysqlcppconn))
$(eval $(call gb_Library_use_externals,mysqlcppconn, \
boost_headers \
mariadb \
mariadb-connector-c \
))
ifneq ($(OS),WNT)
......@@ -25,7 +25,7 @@ $(eval $(call gb_Library_add_libs,mysqlcppconn,\
endif
ifeq ($(OS),MACOSX)
ifeq ($(SYSTEM_MARIADB),)
ifeq ($(SYSTEM_MARIADB_CONNECTOR_C),)
$(eval $(call gb_Library_use_externals,mysqlcppconn,\
iconv \
))
......
......@@ -26,7 +26,7 @@ ifeq ($(SYSTEM_MYSQL_CPPCONN),)
$(eval $(call gb_Extension_add_library,mysql-connector-ooo,mysqlcppconn))
endif
ifneq ($(BUNDLE_MARIADB),)
ifneq ($(BUNDLE_MARIADB_CONNECTOR_C),)
$(eval $(call gb_Extension_add_files,mysql-connector-ooo,,\
$(LIBMARIADB_PATH)/$(LIBMARIADB) \
))
......
......@@ -38,7 +38,7 @@ $(eval $(call gb_Library_add_defs,mysqlc,\
-DMARIADBC_VERSION_MICRO=$(MARIADBC_MICRO) \
$(if $(SYSTEM_MYSQL_CPPCONN),,\
-DCPPCONN_LIB=\"$(call gb_Library_get_runtime_filename,mysqlcppconn)\") \
$(if $(BUNDLE_MARIADB),-DBUNDLE_MARIADB=\"$(LIBMARIADB)\") \
$(if $(BUNDLE_MARIADB_CONNECTOR_C),-DBUNDLE_MARIADB=\"$(LIBMARIADB)\") \
))
$(eval $(call gb_Library_add_exception_objects,mysqlc,\
......
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