From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3B47C158020 for ; Mon, 17 Oct 2022 05:32:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80188E0C68; Mon, 17 Oct 2022 05:32:52 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6BE15E0C68 for ; Mon, 17 Oct 2022 05:32:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9F738341092 for ; Mon, 17 Oct 2022 05:32:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 15A295D7 for ; Mon, 17 Oct 2022 05:32:50 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1665984753.75c4fa458ee594581dc4ecff5f1423db75ed2716.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c++/files/, dev-db/mysql-connector-c++/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.27-mysqlclient_r.patch dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27-r1.ebuild X-VCS-Directories: dev-db/mysql-connector-c++/ dev-db/mysql-connector-c++/files/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 75c4fa458ee594581dc4ecff5f1423db75ed2716 X-VCS-Branch: master Date: Mon, 17 Oct 2022 05:32:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bb6f818e-e9e9-4109-9980-629822d193e0 X-Archives-Hash: cdb0575366fec80e81849a4d49fcdaeb commit: 75c4fa458ee594581dc4ecff5f1423db75ed2716 Author: Hans de Graaff gentoo org> AuthorDate: Mon Oct 17 05:30:01 2022 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Mon Oct 17 05:32:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c4fa45 dev-db/mysql-connector-c++: fix loading libmysqlclient.so mysql-workbench would fail with mysql-connector-c++ 8.x because it would try to load the obsolete libmysqlclient_r library. This version no longer exists in newer versions of mysql-connector-c. It turns out that mysql-connector-c++ has hard-coded references to this library but since we don't install compatibility symlinks this hardcoded reference will fail. Closes: https://bugs.gentoo.org/831664 Signed-off-by: Hans de Graaff gentoo.org> .../mysql-connector-c++-8.0.27-mysqlclient_r.patch | 24 ++++++++++++ .../mysql-connector-c++-8.0.27-r1.ebuild | 45 ++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.27-mysqlclient_r.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.27-mysqlclient_r.patch new file mode 100644 index 000000000000..d929601f037f --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.27-mysqlclient_r.patch @@ -0,0 +1,24 @@ +--- a/jdbc/FindMySQL.cmake 2021-09-10 18:31:29.000000000 +0200 ++++ b/jdbc/FindMySQL.cmake 2022-01-21 07:40:03.224705056 +0100 +@@ -282,8 +282,8 @@ + # there, pick "libmysqlclient" that in 5.5 and up is multithreaded + # anyway (soft link "libmysqlclient_r" is not installed MySQL Server + # 5.6 and Debian/Ubuntu and might go in 5.7 for all installs) +- set(_dynamic_libs "mysqlclient_r" "mysqlclient") +- set(_static_libs "libmysqlclient_r.a" "libmysqlclient.a") ++ set(_dynamic_libs "mysqlclient") ++ set(_static_libs "libmysqlclient.a") + set(_static_lib_ext ".a") + endif() + +--- a/jdbc/driver/nativeapi/libmysql_dynamic_proxy.cpp 2022-01-21 07:52:41.224586087 +0100 ++++ b/jdbc/driver/nativeapi/libmysql_dynamic_proxy.cpp 2022-01-21 07:52:50.168631719 +0100 +@@ -49,7 +49,7 @@ + #elif defined(__hpux) && defined(__hppa) + static const char * const baseName = "libmysqlclient_r.sl"; + #else +-static const char * const baseName = "libmysqlclient_r.so"; ++static const char * const baseName = "libmysqlclient.so"; + #endif + + template diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27-r1.ebuild new file mode 100644 index 000000000000..9ca9944b1c86 --- /dev/null +++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +CMAKE_MAKEFILE_GENERATOR=emake +inherit cmake + +DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)" +HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/" +URI_DIR="Connector-C++" +SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz" + +LICENSE="Artistic GPL-2" +SLOT="0" +# -ppc, -sparc for bug #711940 +KEYWORDS="~amd64 ~arm ~arm64 -ppc ~ppc64 -sparc ~x86" +IUSE="+legacy" + +RDEPEND=" + dev-libs/protobuf:= + legacy? ( + dev-libs/boost:= + >=dev-db/mysql-connector-c-8.0.27:= + ) + dev-libs/openssl:0= + " +DEPEND="${RDEPEND}" +S="${WORKDIR}/${P}-src" + +PATCHES=( + "${FILESDIR}"/${PN}-8.0.27-fix-build.patch + "${FILESDIR}"/${PN}-8.0.27-mysqlclient_r.patch +) + +src_configure() { + local mycmakeargs=( + -DWITH_SSL=system + -DWITH_JDBC=$(usex legacy ON OFF) + $(usex legacy '-DMYSQLCLIENT_STATIC_BINDING=0' '') + $(usex legacy '-DMYSQLCLIENT_STATIC_LINKING=0' '') + ) + + cmake_src_configure +}