diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-08-10 13:06:02 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-08-10 15:18:20 +0200 |
| commit | 301b56f92b9058731f76e32604a771cac460693d (patch) | |
| tree | 52c858d3e0524b6f75db80b7d69ce71ee3f7065d | |
| parent | 0872e8cc87d753e6bdda9fad510a6b71cf96565f (diff) | |
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@redhat.com>
| -rw-r--r-- | external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk | 1 |
1 files changed, 0 insertions, 1 deletions
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 \ |