commit: 1f7ec6d3f5079460982b24e8f76f844f29d5662b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Feb 22 14:47:20 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Feb 22 15:55:24 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f7ec6d3
dev-libs/papi: drop 6.0.0.1-r1, 6.0.0.1-r2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-libs/papi/Manifest | 1 - .../papi/files/papi-6.0.0.1-configure-c99.patch | 88 ---------------------- .../files/papi-6.0.0.1-configure-clang16.patch | 53 ------------- dev-libs/papi/papi-6.0.0.1-r1.ebuild | 60 --------------- dev-libs/papi/papi-6.0.0.1-r2.ebuild | 66 ---------------- 5 files changed, 268 deletions(-) diff --git a/dev-libs/papi/Manifest b/dev-libs/papi/Manifest index 6f5cf45db24e..06621cebc8f1 100644 --- a/dev-libs/papi/Manifest +++ b/dev-libs/papi/Manifest @@ -1,2 +1 @@ -DIST papi-6.0.0.1.tar.gz 4665285 BLAKE2B 5b6b2de8c16510a05a57159ceba591625c78f2a6d4ea62979fea4dd3e72bce73138e36480d82e13713c9ff2298e00330619fa57fdc7f81d75e1ce519b6f600ae SHA512 54c37b49858e921bd1357d8b0bba12c27e40e89b1354d89e5a85672ef3e6d3a4784212079098004256369a172d744580fb283741e7b4ac2d6fa5642bc42ea2ad DIST papi-7.1.0.tar.gz 5701396 BLAKE2B 66a781552ee6a20daa98e39b5a4385efbc3703e9f633c087f101260c8b3543bc5e8afb9f160b7450fde74ec0322ad632d5aa54b0a9c8d672f6a36b63901b3e50 SHA512 6e427505b9237a2165dee8c198708a26f4b366ca31a424340206d29c56d04b13405d20a734f311a1f18cbbbc1b940eb5c93535cd734b0c796459623e93624219 diff --git a/dev-libs/papi/files/papi-6.0.0.1-configure-c99.patch b/dev-libs/papi/files/papi-6.0.0.1-configure-c99.patch deleted file mode 100644 index 1c38cd69df49..000000000000 --- a/dev-libs/papi/files/papi-6.0.0.1-configure-c99.patch +++ /dev/null @@ -1,88 +0,0 @@ -https://github.com/icl-utk-edu/papi/commit/dd11311aadbd06ab6c76d49a997a8bb2bcdcd5f7 -https://github.com/icl-utk-edu/papi/pull/142 - -From dd11311aadbd06ab6c76d49a997a8bb2bcdcd5f7 Mon Sep 17 00:00:00 2001 -From: Giuseppe Congiu <[email protected]> -Date: Fri, 29 Sep 2023 10:20:28 +0200 -Subject: [PATCH] configure: fix tls detection - -Configure TLS detection tests were failing because of wrong usage of -pthread_create(). Problem was caused by wrong definition of thread -functions which require void *f(void *) instead of int f(void *) or -void f(void *). ---- - configure.in | 6 +++--- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/configure.in b/configure.in -index e77f1d017..346e3dab1 100644 ---- a/configure.in -+++ b/configure.in -@@ -707,7 +707,7 @@ AC_ARG_WITH(tls, - #include <unistd.h> - extern __thread int i; - static int res1, res2; -- void thread_main (void *arg) { -+ void *thread_main (void *arg) { - i = (int)arg; - sleep (1); - if ((int)arg == 1) -@@ -849,7 +849,7 @@ AC_ARG_WITH(virtualtimer, - int gettid() { - return syscall( SYS_gettid ); - } -- int doThreadOne( void * v ) { -+ void *doThreadOne( void * v ) { - struct tms tm; - int status; - while (!done) -@@ -859,7 +859,7 @@ AC_ARG_WITH(virtualtimer, - threadone = tm.tms_utime; - return 0; - } -- int doThreadTwo( void * v ) { -+ void *doThreadTwo( void * v ) { - struct tms tm; - long i, j = 0xdeadbeef; - int status; - -From 08f0d7dfaeb53283ab133e3b7d6f13d03245d88c Mon Sep 17 00:00:00 2001 -From: Florian Weimer <[email protected]> -Date: Mon, 18 Dec 2023 08:18:50 +0100 -Subject: [PATCH] configure: Fix return values in start thread routines - -Thread start routines must return a void * value, and future -compilers refuse to convert integers to pointers with just a warning -(the virtualtimer probe). Without this change, the probe always fails -to compile with future compilers (such as GCC 14). - -For the tls probe, return a null pointer for future-proofing, although -current and upcoming C compilers do not treat this omission as an -error. - -Updates commit dd11311aadbd06ab6c76d ("configure: fix tls detection"). ---- - configure.in | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/configure.in b/configure.in -index 7d95ae1a4..f9b494036 100644 ---- a/configure.in -+++ b/configure.in -@@ -721,6 +721,7 @@ AC_ARG_WITH(tls, - res1 = (i == (int)arg); - else - res2 = (i == (int)arg); -+ return NULL; - } - __thread int i; - int main () { -@@ -812,7 +813,7 @@ AC_ARG_WITH(virtualtimer, - exit(1); - } - done = 1; -- return j; -+ return (void *) j; - } - - int main( int argc, char ** argv ) { diff --git a/dev-libs/papi/files/papi-6.0.0.1-configure-clang16.patch b/dev-libs/papi/files/papi-6.0.0.1-configure-clang16.patch deleted file mode 100644 index a56213cdb6d5..000000000000 --- a/dev-libs/papi/files/papi-6.0.0.1-configure-clang16.patch +++ /dev/null @@ -1,53 +0,0 @@ -https://bitbucket.org/icl/papi/pull-requests/406 - -From 3d09c90d892c845473ba92bb1e9ff0ead4f3eb84 Mon Sep 17 00:00:00 2001 -From: Florian Weimer <[email protected]> -Date: Mon, 28 Nov 2022 08:44:38 +0100 -Subject: [PATCH] configure: Avoid implicit ints and implicit function - declarations - -Implicit ints and implicit function declarations were removed from -the C language in 1999. Relying on them can cause spurious autoconf -check failures with compilers that do not support them in the default -language mode. ---- a/configure.in -+++ b/configure.in -@@ -577,14 +577,16 @@ fi - - AC_MSG_CHECKING(for working gettid) - AC_LINK_IFELSE([AC_LANG_SOURCE([#include <sys/types.h> -- main() { pid_t a = gettid(); }])], -+ #include <unistd.h> -+ int main() { pid_t a = gettid(); }])], - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_GETTID, 1, [Full gettid function])], - [AC_MSG_RESULT(no) - AC_MSG_CHECKING(for working syscall(SYS_gettid)) - AC_LINK_IFELSE([AC_LANG_SOURCE([#include <sys/types.h> - #include <sys/syscall.h> -- main() { pid_t a = syscall(SYS_gettid); }])], -+ #include <unistd.h> -+ int main() { pid_t a = syscall(SYS_gettid); }])], - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SYSCALL_GETTID, 1, [gettid syscall function])], - [AC_MSG_RESULT(no)]) ]) -@@ -625,7 +627,7 @@ AC_ARG_WITH(walltimer, - #include <stdio.h> - #include <time.h> - #include <syscall.h> -- main() { -+ int main() { - struct timespec t1, t2; - double seconds; - if (syscall(__NR_clock_gettime,CLOCK_REALTIME_HR,&t1) == -1) exit(1); -@@ -646,7 +648,7 @@ AC_ARG_WITH(walltimer, - #include <stdio.h> - #include <time.h> - #include <syscall.h> -- main() { -+ int main() { - struct timespec t1, t2; - double seconds; - if (syscall(__NR_clock_gettime,CLOCK_REALTIME,&t1) == -1) exit(1); --- -2.38.1 diff --git a/dev-libs/papi/papi-6.0.0.1-r1.ebuild b/dev-libs/papi/papi-6.0.0.1-r1.ebuild deleted file mode 100644 index aa62e602ab7a..000000000000 --- a/dev-libs/papi/papi-6.0.0.1-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools fortran-2 toolchain-funcs - -DESCRIPTION="Performance Application Programming Interface" -HOMEPAGE="https://icl.cs.utk.edu/papi/"; -SRC_URI="https://icl.cs.utk.edu/projects/${PN}/downloads/${P}.tar.gz"; -S="${WORKDIR}/${P}/src" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND=" - dev-libs/libpfm[static-libs] - virtual/mpi -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-6.0.0.1-configure-clang16.patch -) - -src_prepare() { - default - - mv configure.{in,ac} || die - eautoreconf -} - -src_configure() { - tc-export AR - - # TODO: Could try adding - # --with-static-user-events=no - # --with-static-papi-events=no - # --with-static-lib=no - # --with-static-tools=no - # but this requires fixing the homebrew configure logic for - # little gain - local myeconfargs=( - --with-perf-events - --with-pfm-prefix="${EPREFIX}/usr" - --with-pfm-libdir="${EPREFIX}/usr/$(get_libdir)" - ) - - CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myeconfargs[@]}" -} - -src_install() { - default - - dodoc ../RE* - - find "${ED}" -name '*.a' -delete || die - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/papi/papi-6.0.0.1-r2.ebuild b/dev-libs/papi/papi-6.0.0.1-r2.ebuild deleted file mode 100644 index 85397d1446e2..000000000000 --- a/dev-libs/papi/papi-6.0.0.1-r2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic fortran-2 toolchain-funcs - -DESCRIPTION="Performance Application Programming Interface" -HOMEPAGE="https://icl.utk.edu/papi/"; -SRC_URI="https://icl.utk.edu/projects/${PN}/downloads/${P}.tar.gz"; -S="${WORKDIR}/${P}/src" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~x86" - -DEPEND=" - dev-libs/libpfm[static-libs] - virtual/mpi -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-6.0.0.1-configure-clang16.patch - "${FILESDIR}"/${PN}-6.0.0.1-configure-c99.patch -) - -src_prepare() { - default - - mv configure.{in,ac} || die - eautoreconf -} - -src_configure() { - # -Werror=lto-type-mismatch - # https://bugs.gentoo.org/855983 - # https://github.com/icl-utk-edu/papi/issues/218 - filter-lto - - tc-export AR - - # TODO: Could try adding - # --with-static-user-events=no - # --with-static-papi-events=no - # --with-static-lib=no - # --with-static-tools=no - # but this requires fixing the homebrew configure logic for - # little gain - local myeconfargs=( - --with-perf-events - --with-pfm-prefix="${EPREFIX}/usr" - --with-pfm-libdir="${EPREFIX}/usr/$(get_libdir)" - ) - - CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myeconfargs[@]}" -} - -src_install() { - default - - dodoc ../RE* - - find "${ED}" -name '*.a' -delete || die - find "${ED}" -name '*.la' -delete || die -}
