commit: 65e810c9b1123f6c07d92328dfdf1e60498bc392 Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Mon Apr 8 14:37:50 2024 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Sat Apr 27 12:53:24 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65e810c9
dev-db/mysql-connector-c: add 8.0.36 Changes: - musl patch upstreamed, see [1-3] - mysql.info not present any more, see [4] - lz4 patch updated [1] https://github.com/mysql/mysql-server/commit/dc6b9e2556bf247cda80670b824cb24b271946f2 [2] https://bugs.mysql.com/bug.php?id=110808 [3] https://github.com/mysql/mysql-server/pull/455 [4] https://github.com/mysql/mysql-server/commit/18b2dd3ddfbe06bef9a378f1a87e63d494514b0b Closes: https://bugs.gentoo.org/893912 Closes: https://bugs.gentoo.org/900667 Closes: https://bugs.gentoo.org/759058 Closes: https://bugs.gentoo.org/882743 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/36160 Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> dev-db/mysql-connector-c/Manifest | 1 + ...-8.0.36-always-build-decompress-utilities.patch | 23 ++++ .../mysql-connector-c-8.0.36.ebuild | 123 +++++++++++++++++++++ 3 files changed, 147 insertions(+) diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest index bba4363fe6e8..b1933a7ac25c 100644 --- a/dev-db/mysql-connector-c/Manifest +++ b/dev-db/mysql-connector-c/Manifest @@ -1 +1,2 @@ DIST mysql-boost-8.0.32.tar.gz 436207624 BLAKE2B 8a75fd6fe12d4f870622b3386118737b8f17d116df625ef6187647c870d456823543e0a1e9aa05fff53313c3872df1df23add2508ec735bb7972718fc1e90539 SHA512 937e0d0350cb583bb4de15b080f08ed92b253a6d7c09f13a028855dae154fc84f0c95fb082b818b2fa6fa792cd2d9db8d7dc7a20a2a0d3d2b6839fbd2c821b44 +DIST mysql-boost-8.0.36.tar.gz 438154682 BLAKE2B 066c9dd7f2804ad29808c3bfcf5eae53466f7c40cf1386a9c1f26a0b45dcc3eda8d9618de36e8008e5e4d58b726d6c8ca85aec8d1eda8981f5a49e495b32f046 SHA512 a6c1c009a322b7e7aa2aa607573060414c847c77d48f44a24058ffb89673621f2ebbcc1a4448fa841a87ff721159cc8eaf44a57721c7dc233c130691c16a9d4a diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.36-always-build-decompress-utilities.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.36-always-build-decompress-utilities.patch new file mode 100644 index 000000000000..9c8e654ba280 --- /dev/null +++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.36-always-build-decompress-utilities.patch @@ -0,0 +1,23 @@ +diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt +index da34524..96c7299 100644 +--- a/utilities/CMakeLists.txt ++++ b/utilities/CMakeLists.txt +@@ -124,13 +124,11 @@ MYSQL_ADD_EXECUTABLE(perror + DEPENDENCIES GenError + LINK_LIBRARIES mysys + ) +-IF(WITH_LZ4 STREQUAL "bundled") +- MYSQL_ADD_EXECUTABLE(lz4_decompress +- lz4_decompress.cc +- COMPONENT Server +- LINK_LIBRARIES ext::lz4 mysys +- ) +-ENDIF() ++MYSQL_ADD_EXECUTABLE(lz4_decompress ++ lz4_decompress.cc ++ COMPONENT Server ++ LINK_LIBRARIES ext::lz4 mysys ++ ) + + MYSQL_ADD_EXECUTABLE(zlib_decompress + zlib_decompress.cc diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.36.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.36.ebuild new file mode 100644 index 000000000000..724061855292 --- /dev/null +++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.36.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib flag-o-matic + +DESCRIPTION="C client library for MariaDB/MySQL" +HOMEPAGE="https://dev.mysql.com/downloads/"; + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/mysql/mysql-server.git"; + + inherit git-r3 +else + SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + + S="${WORKDIR}/mysql-${PV}" +fi + +LICENSE="GPL-2" +SLOT="0/21" +IUSE="ldap static-libs" + +RDEPEND=" + >=app-arch/lz4-1.9.4:=[${MULTILIB_USEDEP}] + app-arch/zstd:=[${MULTILIB_USEDEP}] + dev-libs/openssl:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.13:=[${MULTILIB_USEDEP}] + ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +# Avoid file collisions, #692580 +RDEPEND+=" + !<dev-db/mysql-5.6.45-r1 + !=dev-db/mysql-5.7.23* + !=dev-db/mysql-5.7.24* + !=dev-db/mysql-5.7.25* + !=dev-db/mysql-5.7.26-r0 + !=dev-db/mysql-5.7.27-r0 + !<dev-db/percona-server-5.7.26.29-r1 +" + +DOCS=( README ) + +# Wrap the config script +MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) + +PATCHES=( + "${FILESDIR}"/${PN}-8.0.36-always-build-decompress-utilities.patch + "${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch + "${FILESDIR}"/${PN}-8.0.27-res_n.patch +) + +src_prepare() { + sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "scripts/CMakeLists.txt" || die + + # All these are for the server only. + # Disable rpm call which would trigger sandbox, #692368 + sed -i \ + -e '/MYSQL_CHECK_LIBEVENT/d' \ + -e '/MYSQL_CHECK_RAPIDJSON/d' \ + -e '/MYSQL_CHECK_ICU/d' \ + -e '/MYSQL_CHECK_EDITLINE/d' \ + -e '/MYSQL_CHECK_CURL/d' \ + -e '/ADD_SUBDIRECTORY(man)/d' \ + -e '/ADD_SUBDIRECTORY(share)/d' \ + -e '/INCLUDE(cmake\/boost/d' \ + -e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \ + CMakeLists.txt || die + + # Skip building clients + echo > client/CMakeLists.txt || die + + # Forcefully disable auth plugin + if ! use ldap ; then + sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die + echo > libmysql/authentication_ldap/CMakeLists.txt || die + fi + + cmake_src_prepare +} + +multilib_src_configure() { + # Code is now requiring C++17 due to https://github.com/mysql/mysql-server/commit/236ab55bedd8c9eacd80766d85edde2a8afacd08 + append-cxxflags -std=c++17 + + local mycmakeargs=( + -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG + -DINSTALL_LAYOUT=RPM + -DINSTALL_LIBDIR=$(get_libdir) + -DWITH_DEFAULT_COMPILER_OPTIONS=OFF + -DENABLED_LOCAL_INFILE=ON + -DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock" + # Automagically uses LLD with not using LTO (bug #710272, #775845) + -DUSE_LD_LLD=OFF + -DWITH_LZ4=system + -DWITH_NUMA=OFF + -DWITH_SSL=system + -DWITH_ZLIB=system + -DWITH_ZSTD=system + -DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient + -DSHARED_LIB_PATCH_VERSION="0" + -DCMAKE_POSITION_INDEPENDENT_CODE=ON + -DWITHOUT_SERVER=ON + -DWITH_BUILD_ID=OFF + ) + + cmake_src_configure +} + +multilib_src_install_all() { + doman \ + man/my_print_defaults.1 \ + man/perror.1 \ + man/zlib_decompress.1 + + if ! use static-libs ; then + find "${ED}" -name "*.a" -delete || die + fi +}
