commit: 7634bb460cba925a090f004e74a2c5b60ce9e14c
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 17 14:57:40 2023 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 15:00:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7634bb46
dev-db/mysql-connector-c++: reinstate legacy USE flag
This is still required for mysql-workbench.
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
.../files/mysql-connector-c++-8.0.33-jdbc.patch | 11 +++++
.../mysql-connector-c++-8.0.33-r1.ebuild | 57 ++++++++++++++++++++++
2 files changed, 68 insertions(+)
diff --git
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.33-jdbc.patch
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.33-jdbc.patch
new file mode 100644
index 000000000000..9fe986bef0bc
--- /dev/null
+++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.33-jdbc.patch
@@ -0,0 +1,11 @@
+--- a/jdbc/driver/nativeapi/library_loader.h 2023-03-23 17:32:48.000000000
+0100
++++ b/jdbc/driver/nativeapi/library_loader.h 2023-10-17 16:54:37.270710451
+0200
+@@ -45,6 +45,8 @@
+
+ #include <map>
+
++#include "../mysql_util.h"
++
+ namespace sql
+ {
+ namespace mysql
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.33-r1.ebuild
b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.33-r1.ebuild
new file mode 100644
index 000000000000..a6558abd86f4
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.33-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake
+
+URI_DIR="Connector-C++"
+DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/";
+SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz";
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Artistic GPL-2"
+SLOT="0"
+# -ppc, -sparc for bug #711940
+KEYWORDS="~amd64 ~arm ~arm64 -ppc ~ppc64 -sparc ~x86"
+IUSE="+legacy"
+
+RDEPEND="
+ app-arch/lz4:=
+ app-arch/zstd:=
+ dev-libs/openssl:=
+ sys-libs/zlib
+ legacy? (
+ >=dev-db/mysql-connector-c-8.0.27:=
+ )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.0.27-mysqlclient_r.patch
+ "${FILESDIR}"/${P}-jdbc.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUNDLE_DEPENDENCIES=OFF
+ # Cannot handle protobuf >23, bug #912797
+ #-DWITH_PROTOBUF=system
+ -DWITH_LZ4=system
+ -DWITH_SSL=system
+ -DWITH_ZLIB=system
+ -DWITH_ZSTD=system
+ -DWITH_JDBC=$(usex legacy)
+ )
+
+ if use legacy ; then
+ mycmakeargs+=(
+ -DMYSQLCLIENT_STATIC_BINDING=0
+ -DMYSQLCLIENT_STATIC_LINKING=0
+ )
+ fi
+
+ cmake_src_configure
+}
