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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F0E0E15ACFB for ; Sun, 9 Apr 2023 05:31:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2672AE0849; Sun, 9 Apr 2023 05:31:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 4F92AE0849 for ; Sun, 9 Apr 2023 05:31:12 +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 2342B33BEE8 for ; Sun, 9 Apr 2023 05:31:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B554F8AC for ; Sun, 9 Apr 2023 05:31:08 +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: <1681018034.016648eda578932e93becd587cbc9bc4e376c9e3.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/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/ dev-db/mysql-connector-c/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 016648eda578932e93becd587cbc9bc4e376c9e3 X-VCS-Branch: master Date: Sun, 9 Apr 2023 05:31:08 +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: 368c29b8-03fa-4abf-bcae-638488d64bd8 X-Archives-Hash: f693366a54bfe951bc92dc131784a1a4 commit: 016648eda578932e93becd587cbc9bc4e376c9e3 Author: orbea riseup net> AuthorDate: Fri Apr 7 19:55:08 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Apr 9 05:27:14 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=016648ed dev-db/mysql-connector-c: Build fixes * Adds -DWITH_BUILD_ID=OFF to workaround various build issues * Patches the source to work with musl Upstream-PR: https://github.com/mysql/mysql-server/pull/455 Closes: https://bugs.gentoo.org/886474 Closes: https://bugs.gentoo.org/903415 Closes: https://bugs.gentoo.org/885035 Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/gentoo/pull/30517 Signed-off-by: Sam James gentoo.org> .../files/mysql-connector-c-8.0.32-musl.patch | 25 ++++++++++++++++++++++ .../mysql-connector-c-8.0.32-r1.ebuild | 2 ++ 2 files changed, 27 insertions(+) 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 new file mode 100644 index 000000000000..252c5eeda32e --- /dev/null +++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.32-musl.patch @@ -0,0 +1,25 @@ +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 index 57568257e26e..59782a42d7ae 100644 --- 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 @@ -51,6 +51,7 @@ PATCHES=( "${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch "${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch "${FILESDIR}"/${PN}-8.0.27-res_n.patch + "${FILESDIR}"/${PN}-8.0.32-musl.patch ) src_prepare() { @@ -103,6 +104,7 @@ multilib_src_configure() { -DSHARED_LIB_PATCH_VERSION="0" -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DWITHOUT_SERVER=ON + -DWITH_BUILD_ID=OFF ) cmake_src_configure