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 6CAA915ACFC for ; Fri, 14 Apr 2023 04:01:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84F22E0844; Fri, 14 Apr 2023 04:01:00 +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 B76FCE081E for ; Fri, 14 Apr 2023 04:00:59 +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 6C276340E6B for ; Fri, 14 Apr 2023 04:00:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DBAF4A3E for ; Fri, 14 Apr 2023 04:00:56 +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: <1681444797.e7366c7358e43e26c1558324b252620c4cdc0dfb.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/files/, dev-db/mariadb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mariadb/files/mariadb-10.6.11-configure-clang16.patch dev-db/mariadb/mariadb-10.6.11-r3.ebuild dev-db/mariadb/mariadb-10.6.11-r4.ebuild dev-db/mariadb/mariadb-10.6.12-r1.ebuild X-VCS-Directories: dev-db/mariadb/files/ dev-db/mariadb/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e7366c7358e43e26c1558324b252620c4cdc0dfb X-VCS-Branch: master Date: Fri, 14 Apr 2023 04:00:56 +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: 6d45538b-3284-483f-bcb4-e5cdf4f1eccb X-Archives-Hash: 2ea25c588fdb8e033a439f4109d74f00 commit: e7366c7358e43e26c1558324b252620c4cdc0dfb Author: Sam James gentoo org> AuthorDate: Fri Apr 14 03:55:24 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Apr 14 03:59:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7366c73 dev-db/mariadb: fix configure w/ clang 16 Bug: https://bugs.gentoo.org/899772 Signed-off-by: Sam James gentoo.org> .../files/mariadb-10.6.11-configure-clang16.patch | 26 ++++++++++++++++++++++ ...10.6.11-r3.ebuild => mariadb-10.6.11-r4.ebuild} | 7 ++++++ dev-db/mariadb/mariadb-10.6.12-r1.ebuild | 7 ++++++ 3 files changed, 40 insertions(+) diff --git a/dev-db/mariadb/files/mariadb-10.6.11-configure-clang16.patch b/dev-db/mariadb/files/mariadb-10.6.11-configure-clang16.patch new file mode 100644 index 000000000000..cc97319f4bc1 --- /dev/null +++ b/dev-db/mariadb/files/mariadb-10.6.11-configure-clang16.patch @@ -0,0 +1,26 @@ +https://github.com/MariaDB/server/pull/2593 + +From 50c034d6de4fa508186cb8f75cb6073f5d0ced2f Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Tue, 11 Apr 2023 09:39:40 +0200 +Subject: [PATCH] rocksdb: Define _GNU_SOURCE during fallocate CMake probe + +The glibc headers declare fallocate only if _GNU_SOURCE is defined. +Without this change, the probe fails with C compilers which do not +support implicit function declarations even if the system does in +fact support the fallocate function. + +Upstream rocksdb does not need this because the probe is run with the +C++ compiler, and current g++ versions define _GNU_SOURCE +automatically. +--- a/storage/rocksdb/build_rocksdb.cmake ++++ b/storage/rocksdb/build_rocksdb.cmake +@@ -134,6 +134,7 @@ option(WITH_FALLOCATE "build with fallocate" ON) + if(WITH_FALLOCATE AND UNIX) + include(CheckCSourceCompiles) + CHECK_C_SOURCE_COMPILES(" ++#define _GNU_SOURCE + #include + #include + int main() { + diff --git a/dev-db/mariadb/mariadb-10.6.11-r3.ebuild b/dev-db/mariadb/mariadb-10.6.11-r4.ebuild similarity index 99% rename from dev-db/mariadb/mariadb-10.6.11-r3.ebuild rename to dev-db/mariadb/mariadb-10.6.11-r4.ebuild index 10e0da46a123..a9cf9c365dc7 100644 --- a/dev-db/mariadb/mariadb-10.6.11-r3.ebuild +++ b/dev-db/mariadb/mariadb-10.6.11-r4.ebuild @@ -128,6 +128,12 @@ RDEPEND="${COMMON_DEPEND} # dev-perl/DBD-mysql is needed by some scripts installed by MySQL PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" +QA_CONFIG_IMPL_DECL_SKIP=( + # These don't exist on Linux + pthread_threadid_np + getthrid +) + mysql_init_vars() { MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"} MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} @@ -211,6 +217,7 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-10.6.11-gssapi.patch eapply "${FILESDIR}"/${PN}-10.6.11-include.patch eapply "${FILESDIR}"/${PN}-10.6.11-gcc-13.patch + eapply "${FILESDIR}"/${PN}-10.6.11-configure-clang16.patch eapply_user diff --git a/dev-db/mariadb/mariadb-10.6.12-r1.ebuild b/dev-db/mariadb/mariadb-10.6.12-r1.ebuild index a79aca4cedf2..9fe113c8b843 100644 --- a/dev-db/mariadb/mariadb-10.6.12-r1.ebuild +++ b/dev-db/mariadb/mariadb-10.6.12-r1.ebuild @@ -129,6 +129,12 @@ RDEPEND="${COMMON_DEPEND} # dev-perl/DBD-mysql is needed by some scripts installed by MySQL PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" +QA_CONFIG_IMPL_DECL_SKIP=( + # These don't exist on Linux + pthread_threadid_np + getthrid +) + mysql_init_vars() { MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"} MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} @@ -212,6 +218,7 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-10.6.11-gssapi.patch eapply "${FILESDIR}"/${PN}-10.6.11-include.patch eapply "${FILESDIR}"/${PN}-10.6.12-gcc-13.patch + eapply "${FILESDIR}"/${PN}-10.6.11-configure-clang16.patch eapply_user