From c9b5a916efac64df2a39870a92cc6b67116d1b9f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Aug 2024 14:56:08 +0100 Subject: gentoo auto-resync : 24:08:2024 - 14:56:07 --- dev-libs/libpfm/Manifest | 3 ++- .../files/libpfm-4.13.0-musl-WORDSIZE_undeclared.patch | 17 +++++++++++++++++ dev-libs/libpfm/libpfm-4.13.0.ebuild | 9 ++++++--- 3 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 dev-libs/libpfm/files/libpfm-4.13.0-musl-WORDSIZE_undeclared.patch (limited to 'dev-libs/libpfm') diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest index bdd0e877b941..9be0a3708c40 100644 --- a/dev-libs/libpfm/Manifest +++ b/dev-libs/libpfm/Manifest @@ -1,7 +1,8 @@ +AUX libpfm-4.13.0-musl-WORDSIZE_undeclared.patch 518 BLAKE2B b88b0f7f27954a0d74e8fdf159555e62cdb3cb1fbba370d419d9a10dab3c43a5fbbd943c852f258339e38d52ebd33e2ed11fb5477e9b620fd35f752ac0013b26 SHA512 59c6e9b912d97f133a50531d31238e0bfa745a518cb8be42c2bc0a7516e1736130c312f0f8be79875305aae2bd3542bdc827c1048d9c1933a8ce23ae7d5c9fc0 DIST libpfm-4.11.0.tar.gz 1043686 BLAKE2B 99b4f1a5156316139603cf50cf42c13c548a0b196435bfc92bc26ebd3f8d7ec9584255978d4f3fbff45cddc937269961e9d2b65d065632ae635e9ca45c179a54 SHA512 633035b8a7b35973437572095cdc80d422b2a1a61e74e14f106db95fa8e44e4518e591699cc457f828b8f2fb63f60eef6d0c7535c6b4c9a6c3a70d4550b3c3c7 DIST libpfm-4.12.0.tar.gz 1109288 BLAKE2B 035133d98305317b8331de9f3d986bf37b290cc80d2b944e9bac1c48a8659984ac190a0af1abe64bd9e0fee465f31ca11e3a35702f8a8da8a8a480a1aa625ac7 SHA512 dc47d862d619241db4a077a98b3f71a68f04be1be41e10c7b7dd2e596e6c79e9e0ff1d1028798dfb280553f98296b4b57339b4e6675749e1497dc1c9de06d9f8 DIST libpfm-4.13.0.tar.gz 1128221 BLAKE2B 71fddec8993acec5c14d140d80804d41a12ae2fe22368b74bf94f10f95f51946bf9150b4329ca481756228366fc86b1ff5f795a97de181d211dc175c374a5653 SHA512 e61b210aa2ce80f0e47603c88eee2e4f2fe30ca2c0e194a5472b6a8de3bf9dc1085e5261bbb9ddbe5b6531c4b391fb34f20d038e5ebd8e6f4c14c2112aee508f EBUILD libpfm-4.11.0.ebuild 982 BLAKE2B f8eff230a0b72c53ea34c7359bd4acf9f870a76f9d249aeca7286ed6afe44ca1cb484514f908af2d8fe38c101ed2ead981b2a2e51feaea8036c36fd3cbe2e375 SHA512 64cfe4cb1fa6cd6f7fa3701fda7514056b228ec9eb25d71a4206d0eb93bb966db7ee2df4bdd50607eaad3285cddcaebdd6a3612bab355dfb09986c6d2e91e37d EBUILD libpfm-4.12.0.ebuild 989 BLAKE2B ad16fd930e06927adb7dc649e281719881228723c3b051efd8b25b47da7fbbba631ce5332a06dfb346cf678656638de876f69d3ea259a3eeb5e7477c334b0e3b SHA512 323798d793de52d76a267a2d2e0582785ab790804ccf7bfdc25f170364bc8c5ec9c2580171b97b778b162510968c9968a2ca4fb06ad9be7f573f65fdf651bd1a -EBUILD libpfm-4.13.0.ebuild 1054 BLAKE2B 6ecec836532117062946c03765d66757d994f94379614650e9ff032fd63906afef3c067e287829ae1a3865b47cfa225bafe94fb0519493b55a7e8b1575069805 SHA512 5194f8d6d886f43e3c44516733c90d79e1f1be3c91c5dce538fc2189854763db3d43ecaa1264bc0c1facea031e46f5cb64885158d3a145bb7f2d1f3bafa32ac6 +EBUILD libpfm-4.13.0.ebuild 1115 BLAKE2B 2dc54ca1dae286261f274537cd10db73a370b5ac1104ebf91d679d050610ac1782ca4c0d782cb075e1553e1141da8c7b2256bc772fd9e9951f3a8071083a69aa SHA512 b6e2ab4c0a14b928465df308d4fb21f764a27cde84822229077b729368455f531821125fd9d3e60b2acfaca2b208ca1d4d7db532197e3cbbc26931ae57f6f9b2 MISC metadata.xml 246 BLAKE2B 08a76e53ab8da2beee24c0920d47104aefd113853da0d9295967f0db8800717ea4486bddfb9ea1dd83039bb8f8deaf99edb834e2ed2bfe0207282130c7878a90 SHA512 7123d176941aa889b85a3fb204987908d69d05cfe577678b8e8bb0a4512b6a274dfb7e0ad1d2f5d93078512b78f89227712fdd3262fed332caafcaa40ffbc735 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 + #include + #include ++#ifndef __GLIBC__ ++#include ++#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..8b7578d070a8 100644 --- a/dev-libs/libpfm/libpfm-4.13.0.ebuild +++ b/dev-libs/libpfm/libpfm-4.13.0.ebuild @@ -11,9 +11,13 @@ SRC_URI="https://downloads.sourceforge.net/perfmon2/${PN}4/${P}.tar.gz" LICENSE="GPL-2 MIT" SLOT="0/4" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +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() { -- cgit v1.2.3