From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DD5B015827B for ; Mon, 11 Aug 2025 12:31:24 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id C3A36341052 for ; Mon, 11 Aug 2025 12:31:24 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id AE8D7110280; Mon, 11 Aug 2025 12:31:23 +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 bobolink.gentoo.org (Postfix) with ESMTPS id A4F3E110280 for ; Mon, 11 Aug 2025 12:31:23 +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 3AFB9341052 for ; Mon, 11 Aug 2025 12:31:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 904493337 for ; Mon, 11 Aug 2025 12:31:21 +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: <1754915420.0c86cb0e9f49d92d979086211eefdbf641a44c94.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/xxhash/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/xxhash/xxhash-0.8.3.ebuild X-VCS-Directories: dev-libs/xxhash/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0c86cb0e9f49d92d979086211eefdbf641a44c94 X-VCS-Branch: master Date: Mon, 11 Aug 2025 12:31:21 +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: 655ed15b-b7ae-407d-849d-ea38b5d47ccd X-Archives-Hash: 7b9017dd40cf1c93e9ee62e0ba1edd6e commit: 0c86cb0e9f49d92d979086211eefdbf641a44c94 Author: Sam James gentoo org> AuthorDate: Mon Aug 11 12:29:30 2025 +0000 Commit: Sam James gentoo org> CommitDate: Mon Aug 11 12:30:20 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c86cb0e dev-libs/xxhash: fix build with -Og -Og inlines much less so always_inline doesn't mix well with it. Per the upstream README, pass -DXXH_NO_INLINE_HINTS with -Og. Also, for tests, we have to inject CPPFLAGS into CFLAGS, otherwise test_sanity fails on the same issue (can't build). Committing this now so toralf's worker is unblocked. Closes: https://bugs.gentoo.org/961093 Signed-off-by: Sam James gentoo.org> dev-libs/xxhash/xxhash-0.8.3.ebuild | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dev-libs/xxhash/xxhash-0.8.3.ebuild b/dev-libs/xxhash/xxhash-0.8.3.ebuild index f37f8df2867d..1ba92035c3f8 100644 --- a/dev-libs/xxhash/xxhash-0.8.3.ebuild +++ b/dev-libs/xxhash/xxhash-0.8.3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit multilib-minimal toolchain-funcs +inherit flag-o-matic multilib-minimal toolchain-funcs DESCRIPTION="Extremely fast non-cryptographic hash algorithm" HOMEPAGE="https://xxhash.com/" @@ -20,12 +20,20 @@ src_prepare() { multilib_copy_sources } +src_configure() { + # Needed for -Og to be buildable, otherwise fails a/ always_inline (bug #961093) + # https://github.com/Cyan4973/xxHash?tab=readme-ov-file#binary-size-control + is-flagq '-Og' && append-cppflags -DXXH_NO_INLINE_HINTS + multilib-minimal_src_configure +} + multilib_src_compile() { emake AR="$(tc-getAR)" CC="$(tc-getCC)" } multilib_src_test() { - emake CC="$(tc-getCC)" check + # Injecting CPPFLAGS into CFLAGS is needed for test_sanity + emake CC="$(tc-getCC)" CFLAGS="${CPPFLAGS} ${CFLAGS}" check } multilib_src_install() {