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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2D47015813A for ; Thu, 09 Jan 2025 03:15:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB6F4E070D; Thu, 09 Jan 2025 03:15:02 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 38D3CE038D for ; Thu, 09 Jan 2025 03:15:00 +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 449D033BF08 for ; Thu, 09 Jan 2025 03:14:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A14A11DD4 for ; Thu, 09 Jan 2025 03:14:57 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1736392327.fadbbe376bcf3f967f99a657e5064c6606cabfeb.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c/, dev-db/mysql-connector-c/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mysql-connector-c/Manifest dev-db/mysql-connector-c/files/mysql-connector-c-8.0.22-always-build-decompress-utilities.patch dev-db/mysql-connector-c/files/mysql-connector-c-8.0.32-musl.patch dev-db/mysql-connector-c/mysql-connector-c-8.0.32-r1.ebuild X-VCS-Directories: dev-db/mysql-connector-c/files/ dev-db/mysql-connector-c/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: fadbbe376bcf3f967f99a657e5064c6606cabfeb X-VCS-Branch: master Date: Thu, 09 Jan 2025 03:14:57 +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: 65be3ec5-92a9-48a6-a154-a62a74bacaf0 X-Archives-Hash: 38ea6b8fcc859032b6d1c8fb0303d603 commit: fadbbe376bcf3f967f99a657e5064c6606cabfeb Author: Sam James gentoo org> AuthorDate: Thu Jan 9 03:12:07 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jan 9 03:12:07 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fadbbe37 dev-db/mysql-connector-c: drop 8.0.32-r1 Signed-off-by: Sam James gentoo.org> dev-db/mysql-connector-c/Manifest | 1 - ...-8.0.22-always-build-decompress-utilities.patch | 22 ---- .../files/mysql-connector-c-8.0.32-musl.patch | 25 ---- .../mysql-connector-c-8.0.32-r1.ebuild | 127 --------------------- 4 files changed, 175 deletions(-) diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest index b1933a7ac25c..4df88f2a9a68 100644 --- a/dev-db/mysql-connector-c/Manifest +++ b/dev-db/mysql-connector-c/Manifest @@ -1,2 +1 @@ -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.22-always-build-decompress-utilities.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.22-always-build-decompress-utilities.patch deleted file mode 100644 index b0046fd8b224..000000000000 --- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.22-always-build-decompress-utilities.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/utilities/CMakeLists.txt -+++ b/utilities/CMakeLists.txt -@@ -123,14 +123,11 @@ MYSQL_ADD_EXECUTABLE(perror - DEPENDENCIES GenError - LINK_LIBRARIES mysys - ) --IF(BUILD_BUNDLED_LZ4) -- MYSQL_ADD_EXECUTABLE(lz4_decompress -- lz4_decompress.cc -- COMPONENT Server -- LINK_LIBRARIES ${LZ4_LIBRARY} mysys -- ) --ENDIF() -- -+MYSQL_ADD_EXECUTABLE(lz4_decompress -+ lz4_decompress.cc -+ COMPONENT Server -+ LINK_LIBRARIES ${LZ4_LIBRARY} mysys -+ ) - MYSQL_ADD_EXECUTABLE(zlib_decompress - zlib_decompress.cc - COMPONENT Server diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.32-musl.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.32-musl.patch deleted file mode 100644 index 252c5eeda32e..000000000000 --- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.32-musl.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://github.com/mysql/mysql-server/pull/454 - -From c875f049cb3571da1b9b5bcae50caccc5ee47cfb Mon Sep 17 00:00:00 2001 -From: orbea -Date: Fri, 7 Apr 2023 12:47:51 -0700 -Subject: [PATCH] sql/memory: Fix the musl build - -_SC_LEVEL1_DCACHE_LINESIZE is not specific to linux, but to glibc. ---- - sql/memory/aligned_atomic.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sql/memory/aligned_atomic.h b/sql/memory/aligned_atomic.h -index d13d45b9deea..bd19c0cf4d6f 100644 ---- a/sql/memory/aligned_atomic.h -+++ b/sql/memory/aligned_atomic.h -@@ -76,7 +76,7 @@ static inline size_t _cache_line_size() { - return line_size; - } - --#elif defined(__linux__) -+#elif defined(__GLIBC__) - static inline size_t _cache_line_size() { - long size = sysconf(_SC_LEVEL1_DCACHE_LINESIZE); - if (size == -1) return 64; diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.32-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.32-r1.ebuild deleted file mode 100644 index 439f779c8568..000000000000 --- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.32-r1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2023 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 ~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+=" - ! 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() { - # Not a GNU info file, more like a tiny README. - rm "${ED}"/usr/share/info/mysql.info || die - - 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 -}