[Libreoffice-commits] core.git: external/mariadb-connector-c

[Stephan Bergmann (via logerrit)]

 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 301b56f92b9058731f76e32604a771cac460693d
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Aug 10 13:06:02 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Aug 10 15:18:20 2020 +0200

    external/mariadb-connector-c: ma_bmove_upp is defined twice
    
    ...in UnpackedTarball/mariadb-connector-c/libmariadb/bmove_upp and in
    workdir/UnpackedTarball/mariadb-connector-c/libmariadb/ma_stmt_codec.c.  Given
    that the first of the two contains nothing but that redundant declaration, lets
    drop it from the (hand-curated?) list of included source files.
    
    (I came across this when experimenting with --enable-lto on Linux and
    temporarily including static libraries as --whole-archive, which thus caused a
    "multiple definition" error when linking StaticLibrary_mariadb-connector-c into
    Library_mysqlc.)
    
    Change-Id: I8c5f4de476a4bbd036fd25940cdb44d11954ecc8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100427
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index b0c62e1b160e..fee019afa4f8 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\
 endif
 
 $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
-	UnpackedTarball/mariadb-connector-c/libmariadb/bmove_upp \
 	UnpackedTarball/mariadb-connector-c/libmariadb/get_password \
 	UnpackedTarball/mariadb-connector-c/libmariadb/ma_alloc \
 	UnpackedTarball/mariadb-connector-c/libmariadb/ma_array \