ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

mariadb-connector-c: upgrade to 3.4.8 (master only)

Browse Source 
Downloaded from https://dlm.mariadb.com/4516944/Connectors/c/connector-c-3.4.8/mariadb-connector-c-3.4.8-src.tar.gz

Change-Id: I442ed091fc67a2820a965c7eefb73b958965a09b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194886
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli
2025-12-09 00:08:32 +01:00
parent 1e275b2e0f
commit 72f548d039
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
download.lst
+2 -2
View File
@@ -487,8 +487,8 @@ LZMA_TARBALL := xz-5.8.1.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
MARIADB_CONNECTOR_C_SHA256SUM := 292c0f2e6ce5cb6f1217f3a53c72f792e55fb20393e00924b11943e2f9f6e9d5
MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.3.18-src.tar.gz
MARIADB_CONNECTOR_C_SHA256SUM := 156aed3b49f857d0ac74fb76f1982968bcbfd8382da3f5b6ae71f616729920d7
MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.4.8-src.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
Vendored
+8 -9
View File
@@ -16,6 +16,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,mariadb-connector-c,mariadb-connecto
$(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\
$$(INCLUDE) \
-I$(gb_UnpackedTarball_workdir)/mariadb-connector-c/include \
$(if $(filter $(OS),WNT),-I$(gb_UnpackedTarball_workdir)/mariadb-connector-c/win-iconv) \
))
# This is needed for MSVC 2008: it somehow finds a dlopen somewhere
@@ -23,15 +24,12 @@ $(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\
# This macro enables a re-definition to native Win32 APIs in my_global.h.
$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-DHAVE_DLOPEN -DHAVE_COMPRESS -D ENABLED_LOCAL_INFILE -D LIBMARIADB -D THREAD -DSQLITE_ENABLE_COLUMN_METADATA=1))
ifeq ($(OS),WNT)
$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-D_TIMESPEC_DEFINED -DHAVE_STRTOULL -DHAVE_WINCRYPT))
$(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\
$$(INCLUDE) \
-I$(gb_UnpackedTarball_workdir)/mariadb-connector-c/win-iconv \
))
else
$(eval $(call gb_StaticLibrary_use_external,mariadb-connector-c,openssl_headers))
$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-DHAVE_OPENSSL))
ifeq ($(OS),WNT)
$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-D_TIMESPEC_DEFINED -DHAVE_STRTOULL -DHAVE_WINCRYPT -DHAVE_OPENSSL -DHAVE_TLS))
else
$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-DHAVE_OPENSSL -DHAVE_TLS))
endif
$(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
@@ -53,11 +51,12 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/ma_net \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_password \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_pvio \
UnpackedTarball/mariadb-connector-c/libmariadb/secure/openssl \
UnpackedTarball/mariadb-connector-c/plugins/auth/auth_gssapi_client \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_sha1 \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_stmt_codec \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_string \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_time \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_tls \
UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_async \
UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_charset \
UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_dyncol \