From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/xxhash/
Date: Mon, 11 Aug 2025 12:31:21 +0000 (UTC) [thread overview]
Message-ID: <1754915420.0c86cb0e9f49d92d979086211eefdbf641a44c94.sam@gentoo> (raw)
commit: 0c86cb0e9f49d92d979086211eefdbf641a44c94
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 11 12:29:30 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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() {
next reply other threads:[~2025-08-11 12:31 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-11 12:31 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-08-18 22:23 [gentoo-commits] repo/gentoo:master commit in: dev-libs/xxhash/ James Le Cuirot
2025-06-21 3:59 Sam James
2025-06-19 3:37 Sam James
2025-06-19 3:37 Sam James
2025-06-19 3:37 Sam James
2025-06-19 3:37 Sam James
2025-02-02 8:20 Guilherme Amadio
2025-02-02 8:20 Guilherme Amadio
2023-10-27 12:17 Sam James
2023-10-18 15:42 Arthur Zamarin
2023-10-17 4:47 Sam James
2023-10-17 4:47 Sam James
2023-10-17 3:48 Sam James
2023-10-17 3:48 Sam James
2023-10-17 3:48 Sam James
2023-10-17 3:48 Sam James
2023-09-13 21:05 Ionen Wolkens
2023-09-13 21:05 Ionen Wolkens
2023-02-26 18:16 Arthur Zamarin
2022-05-10 0:44 WANG Xuerui
2022-02-12 12:34 Arthur Zamarin
2022-02-11 20:05 Arthur Zamarin
2022-02-11 18:11 Arthur Zamarin
2022-02-11 12:27 Sam James
2022-02-11 12:27 Sam James
2022-02-11 12:27 Sam James
2022-02-11 10:40 Jakov Smolić
2022-02-11 10:40 Jakov Smolić
2021-12-14 12:14 Guilherme Amadio
2021-12-14 10:03 Guilherme Amadio
2021-01-24 23:31 Sam James
2021-01-24 22:02 Sam James
2021-01-24 13:33 Sam James
2021-01-23 23:53 Sam James
2021-01-23 5:56 Sam James
2021-01-21 21:30 Sergei Trofimovich
2020-11-19 16:10 Guilherme Amadio
2020-07-28 22:01 Guilherme Amadio
2020-07-28 21:54 Guilherme Amadio
2020-07-18 20:10 Sam James
2020-07-12 9:16 Sergei Trofimovich
2020-07-09 8:34 Agostino Sarubbo
2020-07-07 6:58 Sergei Trofimovich
2020-07-06 7:22 Sergei Trofimovich
2020-07-06 7:02 Sergei Trofimovich
2020-07-04 21:42 Guilherme Amadio
2020-07-04 21:42 Guilherme Amadio
2020-07-04 21:42 Guilherme Amadio
2020-06-26 16:26 Mikle Kolyada
2020-06-03 7:56 Guilherme Amadio
2020-04-15 9:56 Guilherme Amadio
2020-04-15 9:56 Guilherme Amadio
2020-04-15 9:30 Guilherme Amadio
2020-03-17 17:56 Mart Raudsepp
2020-03-16 18:25 Sergei Trofimovich
2020-03-14 19:24 Sergei Trofimovich
2020-03-07 12:03 Agostino Sarubbo
2020-03-07 10:54 Agostino Sarubbo
2020-03-07 10:50 Agostino Sarubbo
2020-03-07 8:59 Agostino Sarubbo
2020-03-07 8:25 Agostino Sarubbo
2019-08-16 14:35 Guilherme Amadio
2019-05-07 7:00 Guilherme Amadio
2019-04-13 2:23 Aaron Bauman
2019-01-05 17:19 Mikle Kolyada
2018-12-25 12:21 Sergei Trofimovich
2018-11-18 12:00 Mikle Kolyada
2018-10-17 12:11 Tobias Klausmann
2018-10-05 13:33 Mikle Kolyada
2018-10-05 4:10 Thomas Deutschmann
2018-09-09 9:44 Jeroen Roovers
2018-09-09 9:44 Jeroen Roovers
2018-09-08 11:30 Jeroen Roovers
2018-08-29 13:00 Guilherme Amadio
2018-08-12 13:24 Sergei Trofimovich
2018-08-11 18:55 Sergei Trofimovich
2018-08-09 22:34 Sergei Trofimovich
2018-08-09 8:40 Michał Górny
2018-08-09 7:51 Guilherme Amadio
2018-07-24 18:09 Guilherme Amadio
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1754915420.0c86cb0e9f49d92d979086211eefdbf641a44c94.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox