[Libreoffice-commits] core.git: configure.ac download.lst Makefile.fetch

[Libreoffice Gerrit user]

 Makefile.fetch |    1 -
 configure.ac   |    1 -
 download.lst   |    2 --
 3 files changed, 4 deletions(-)

New commits:
commit 44f878924648c23f5332e8a759b8c419b88724e1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Aug 26 14:41:17 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Aug 26 17:50:33 2018 +0200

    MYSQL_CONNECTOR_CPP not built anymore
    
    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
    
        Additionally I erased the remains of the old mysql C++ connector.
    
        Also update the code where the clang plugins were unhappy after moving
        the mysqlc module.
    
        Remove mysql-cpp-connector external.
    
    so we don't need the source to it
    
    Change-Id: I0436e9f5a9cce87d0294cf3163a97a19566df1f4
    Reviewed-on: https://gerrit.libreoffice.org/59605
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/Makefile.fetch b/Makefile.fetch
index 44f5031aac4a..2d1aa0481735 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -188,7 +188,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
 		$(call fetch_Optional,MORE_FONTS,FONT_SCHEHERAZADE_TARBALL) \
 		$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
 		$(call fetch_Optional,MWAW,MWAW_TARBALL) \
-		$(call fetch_Optional,MYSQL_CONNECTOR_CPP,MYSQL_CONNECTOR_CPP_TARBALL) \
 		$(call fetch_Optional,MYTHES,MYTHES_TARBALL) \
 		$(call fetch_Optional,NEON,NEON_TARBALL) \
 		$(call fetch_Optional,NSS,NSS_TARBALL) \
diff --git a/configure.ac b/configure.ac
index 0bd0b862729e..f6f25837bcbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8451,7 +8451,6 @@ int main(int argc, char **argv) {
         LIBS=$save_LIBS
     else
         AC_MSG_RESULT([internal])
-        BUILD_TYPE="$BUILD_TYPE MYSQL_CONNECTOR_CPP"
         SYSTEM_MYSQL_CONNECTOR_CPP=
     fi
     AC_LANG_POP([C++])
diff --git a/download.lst b/download.lst
index ca63722e90d4..7245bba4c7ce 100644
--- a/download.lst
+++ b/download.lst
@@ -175,8 +175,6 @@ export MSPUB_TARBALL := libmspub-0.1.4.tar.xz
 export MWAW_SHA256SUM := aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9
 export MWAW_VERSION_MICRO := 14
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
-export MYSQL_CONNECTOR_CPP_SHA256SUM := a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585
-export MYSQL_CONNECTOR_CPP_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_SHA256SUM := 1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_SHA256SUM := db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca