ac2b3c339e
...so the existing C code started to fail with > In file included from workdir/UnpackedTarball/mariadb-connector-c/libmariadb/ma_alloc.c:20: > workdir/UnpackedTarball/mariadb-connector-c/include/ma_global.h:687:25: error: two or more data types in declaration specifiers > 687 | typedef char bool; /* Ordinary boolean values 0 1 */ > | ^~~~ (And the !defined(HAVE_BOOL) there, always being true, apparently started to get in the way now and thus needed to be removed, whatever its original purpose.) Change-Id: I781458d643e01a7199e19a178da3a32520d16b34 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177260 Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> Tested-by: Jenkins
60 lines
2.6 KiB
Makefile
60 lines
2.6 KiB
Makefile
# -*- 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,mariadb-connector-c))
|
|
|
|
$(eval $(call gb_UnpackedTarball_set_tarball,mariadb-connector-c,$(MARIADB_CONNECTOR_C_TARBALL)))
|
|
|
|
$(eval $(call gb_UnpackedTarball_add_file,mariadb-connector-c,include/mariadb_version.h,external/mariadb-connector-c/configs/mariadb_version.h))
|
|
|
|
ifeq ($(OS),WNT)
|
|
$(eval $(call gb_UnpackedTarball_add_file,mariadb-connector-c,include/ma_config.h,external/mariadb-connector-c/configs/wnt_ma_config.h))
|
|
else
|
|
ifeq ($(OS),MACOSX)
|
|
$(eval $(call gb_UnpackedTarball_add_file,mariadb-connector-c,include/ma_config.h,external/mariadb-connector-c/configs/mac_my_config.h))
|
|
else
|
|
$(eval $(call gb_UnpackedTarball_add_file,mariadb-connector-c,include/ma_config.h,external/mariadb-connector-c/configs/linux_my_config.h))
|
|
endif
|
|
endif # $(OS),WNT
|
|
|
|
$(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb-connector-c,1))
|
|
|
|
$(eval $(call gb_UnpackedTarball_add_patches,mariadb-connector-c,\
|
|
external/mariadb-connector-c/clang-cl.patch.0 \
|
|
external/mariadb-connector-c/c23.patch.0 \
|
|
))
|
|
|
|
# TODO are any "plugins" needed?
|
|
$(eval $(call gb_UnpackedTarball_set_post_action,mariadb-connector-c, \
|
|
< libmariadb/ma_client_plugin.c.in sed \
|
|
-e 's/@EXTERNAL_PLUGINS@/ \
|
|
extern struct st_mysql_client_plugin pvio_socket_client_plugin\; \
|
|
extern struct st_mysql_client_plugin caching_sha2_password_client_plugin\; \
|
|
extern struct st_mysql_client_plugin mysql_native_password_client_plugin\; \
|
|
extern struct st_mysql_client_plugin_AUTHENTICATION auth_gssapi_client_client_plugin\; \
|
|
$(if $(filter WNT,$(OS)), \
|
|
extern struct st_mysql_client_plugin pvio_shmem_client_plugin\; \
|
|
extern struct st_mysql_client_plugin pvio_npipe_client_plugin\; \
|
|
) \
|
|
/' \
|
|
-e 's/@BUILTIN_PLUGINS@/ \
|
|
(struct st_mysql_client_plugin *)\&pvio_socket_client_plugin$(COMMA) \
|
|
(struct st_mysql_client_plugin *)\&caching_sha2_password_client_plugin$(COMMA) \
|
|
(struct st_mysql_client_plugin *)\&mysql_native_password_client_plugin$(COMMA) \
|
|
(struct st_mysql_client_plugin *)\&auth_gssapi_client_client_plugin$(COMMA) \
|
|
$(if $(filter WNT,$(OS)), \
|
|
(struct st_mysql_client_plugin *)\&pvio_shmem_client_plugin$(COMMA) \
|
|
(struct st_mysql_client_plugin *)\&pvio_npipe_client_plugin$(COMMA) \
|
|
) \
|
|
/' \
|
|
> libmariadb/ma_client_plugin.c \
|
|
))
|
|
|
|
|
|
# vim: set noet sw=4 ts=4:
|