commit: ce822669a5c61d5dd8c9503d1fcd70e7b0c38c9f Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Sat Aug 24 09:52:09 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Aug 24 10:00:02 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce822669
dev-libs/libpfm: include header for __WORDSIZE on musl * Also specify -A for tests, otherwise tests may be skipped silently. Closes: https://bugs.gentoo.org/935529 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/38277 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/libpfm-4.13.0-musl-WORDSIZE_undeclared.patch | 17 +++++++++++++++++ dev-libs/libpfm/libpfm-4.13.0.ebuild | 7 +++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dev-libs/libpfm/files/libpfm-4.13.0-musl-WORDSIZE_undeclared.patch b/dev-libs/libpfm/files/libpfm-4.13.0-musl-WORDSIZE_undeclared.patch new file mode 100644 index 000000000000..f5225bbc7f71 --- /dev/null +++ b/dev-libs/libpfm/files/libpfm-4.13.0-musl-WORDSIZE_undeclared.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/935529 + +__WORDSIZE__ is used for getting correct ABI struct sizes, its undeclared on musl unless you include the bits/reg.h header. + +--- a/include/perfmon/pfmlib.h 2023-03-29 02:44:33.000000000 +0300 ++++ b/include/perfmon/pfmlib.h 2024-08-24 12:45:29.084265290 +0300 +@@ -38,6 +38,9 @@ + #include <unistd.h> + #include <inttypes.h> + #include <stdio.h> ++#ifndef __GLIBC__ ++#include <bits/reg.h> ++#endif + + #define LIBPFM_VERSION (4 << 16 | 0) + #define PFM_MAJ_VERSION(v) ((v)>>16) + diff --git a/dev-libs/libpfm/libpfm-4.13.0.ebuild b/dev-libs/libpfm/libpfm-4.13.0.ebuild index b6fa60319c8d..cf139e863f34 100644 --- a/dev-libs/libpfm/libpfm-4.13.0.ebuild +++ b/dev-libs/libpfm/libpfm-4.13.0.ebuild @@ -14,6 +14,10 @@ SLOT="0/4" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="static-libs" +PATCHES=( + "${FILESDIR}"/libpfm-4.13.0-musl-WORDSIZE_undeclared.patch +) + src_prepare() { default @@ -29,8 +33,7 @@ src_compile() { } src_test() { - cd tests || die - ./validate || die + ./tests/validate -A || die } src_install() {
