[Libreoffice-commits] core.git: connectivity/Library_mysqlc.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sun Aug 26 15:49:44 UTC 2018


 connectivity/Library_mysqlc.mk |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 71cbeeee374a416c90df54ef1a0353e04a7ca668
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Aug 26 14:30:38 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Aug 26 17:49:24 2018 +0200

    CPPCONN_LIB now unused
    
    since
    
    commit 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1
    Author: Tamas Bunth <tamas.bunth at collabora.co.uk>
    Date:   Thu Aug 16 16:35:17 2018 +0200
    
        Moving mysqlc into connectivity as a library
    
    Change-Id: Iafc4fb685d8f7b97f8be83dbf26945f9af976f1a
    Reviewed-on: https://gerrit.libreoffice.org/59604
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
index cc8625d060a2..448f13eeca61 100644
--- a/connectivity/Library_mysqlc.mk
+++ b/connectivity/Library_mysqlc.mk
@@ -48,8 +48,6 @@ $(eval $(call gb_Library_add_defs,mysqlc,\
 	-DMARIADBC_VERSION_MAJOR=$(MARIADBC_MAJOR) \
 	-DMARIADBC_VERSION_MINOR=$(MARIADBC_MINOR) \
 	-DMARIADBC_VERSION_MICRO=$(MARIADBC_MICRO) \
-	$(if $(SYSTEM_MYSQL_CONNECTOR_CPP),,\
-	-DCPPCONN_LIB=\"$(call gb_Library_get_runtime_filename,mysqlcppconn)\") \
 	$(if $(BUNDLE_MARIADB_CONNECTOR_C),-DBUNDLE_MARIADB=\"$(LIBMARIADB)\") \
 ))
 


More information about the Libreoffice-commits mailing list