diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-08-26 14:41:17 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-08-28 20:37:25 +0200 |
| commit | f392bc8993461ad748d6465051b48e3c219bcf3d (patch) | |
| tree | 949657ccad0ea93dede7ff741dcacc1fae99939a | |
| parent | 3737042d9a730ab642abf967e4089eeb3a76f94d (diff) | |
MYSQL_CONNECTOR_CPP not built anymore
since...
commit 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1
Author: Tamas Bunth <tamas.bunth@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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 44f878924648c23f5332e8a759b8c419b88724e1)
| -rw-r--r-- | Makefile.fetch | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | download.lst | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index 4bd75aaa02be..bfa697168000 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -187,7 +187,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 e865649034c0..8d19fefed306 100644 --- a/configure.ac +++ b/configure.ac @@ -8252,7 +8252,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 afec547166e9..fc849af70177 100644 --- a/download.lst +++ b/download.lst @@ -191,8 +191,6 @@ export MSPUB_TARBALL := libmspub-0.1.3.tar.xz export MWAW_SHA256SUM := db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea export MWAW_VERSION_MICRO := 13 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 |