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

Michael Stahl (via logerrit) logerrit at kemper.freedesktop.org
Tue Nov 10 13:58:13 UTC 2020


 external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk |   14 +++++-----
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit ed564a411beb13a75a8f06d7cd040acad3e93dcb
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Nov 10 11:14:19 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Tue Nov 10 14:57:31 2020 +0100

    mariadb-connector-c: fix makefile for GNU make 3.82
    
    Old make thinks that ; terminates the recipe, have to escape it.
    (other changes are just cosmetic)
    
    (regression from 8c9b8c5970a08c2ef0ccddb7a691f3731d39175a)
    
    Change-Id: Ib0119511977bbff077f037fbb5975df9f860ae58
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105516
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
index a4b35c5e650a..2f679294f7c6 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -32,15 +32,15 @@ $(eval $(call gb_UnpackedTarball_add_patches,mariadb-connector-c,\
 # 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;\
+		-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\; \
 			/' \
-		-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)\
+		-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) \
 			/' \
-		> libmariadb/ma_client_plugin.c  \
+		> libmariadb/ma_client_plugin.c \
 ))
 
 


More information about the Libreoffice-commits mailing list