diff --git a/.gitignore b/.gitignore index 6bec1fd..5142357 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ papi-4.1.0.tar.gz /papi-6.0.0.tar.gz /papi-7.0.0.tar.gz /papi-7.0.1.tar.gz +/papi-7.1.0.tar.gz diff --git a/papi-configure-c99-1.patch b/papi-configure-c99-1.patch deleted file mode 100644 index d67fdc8..0000000 --- a/papi-configure-c99-1.patch +++ /dev/null @@ -1,73 +0,0 @@ -commit dd11311aadbd06ab6c76d49a997a8bb2bcdcd5f7 -Author: Giuseppe Congiu -Date: Fri Sep 29 10:20:28 2023 +0200 - - 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 *). - -diff --git a/src/configure b/src/configure -index 5c8b37b805a7a97e..8ce0047d803bd641 100755 ---- a/src/configure -+++ b/src/configure -@@ -5225,7 +5225,7 @@ else - #include - 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) -@@ -5418,7 +5418,7 @@ else - int gettid() { - return syscall( SYS_gettid ); - } -- int doThreadOne( void * v ) { -+ void *doThreadOne( void * v ) { - struct tms tm; - int status; - while (!done) -@@ -5428,7 +5428,7 @@ else - threadone = tm.tms_utime; - return 0; - } -- int doThreadTwo( void * v ) { -+ void *doThreadTwo( void * v ) { - struct tms tm; - long i, j = 0xdeadbeef; - int status; -diff --git a/src/configure.in b/src/configure.in -index 01e58c2488ad203a..cb0a4b59bbed1256 100644 ---- a/src/configure.in -+++ b/src/configure.in -@@ -707,7 +707,7 @@ AC_ARG_WITH(tls, - #include - 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; diff --git a/papi-configure-c99-2.patch b/papi-configure-c99-2.patch deleted file mode 100644 index 3e5ce53..0000000 --- a/papi-configure-c99-2.patch +++ /dev/null @@ -1,55 +0,0 @@ -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. - -Submitted upstream: - -diff --git a/src/configure b/src/configure -index 8ce0047d803bd641..f66dc5fb161916c4 100755 ---- a/src/configure -+++ b/src/configure -@@ -5232,6 +5232,7 @@ else - res1 = (i == (int)arg); - else - res2 = (i == (int)arg); -+ return NULL; - } - __thread int i; - int main () { -@@ -5360,7 +5361,7 @@ else - exit(1); - } - done = 1; -- return j; -+ return (void *) j; - } - - int main( int argc, char ** argv ) { -diff --git a/src/configure.in b/src/configure.in -index cb0a4b59bbed1256..37ff2a98ef85fcfe 100644 ---- a/src/configure.in -+++ b/src/configure.in -@@ -714,6 +714,7 @@ AC_ARG_WITH(tls, - res1 = (i == (int)arg); - else - res2 = (i == (int)arg); -+ return NULL; - } - __thread int i; - int main () { -@@ -805,7 +806,7 @@ AC_ARG_WITH(virtualtimer, - exit(1); - } - done = 1; -- return j; -+ return (void *) j; - } - - int main( int argc, char ** argv ) { diff --git a/papi.spec b/papi.spec index b06f116..bae39be 100644 --- a/papi.spec +++ b/papi.spec @@ -14,16 +14,14 @@ %endif Summary: Performance Application Programming Interface Name: papi -Version: 7.0.1 -Release: 7%{?dist} +Version: 7.1.0 +Release: 1%{?dist} License: BSD-3-Clause Requires: papi-libs = %{version}-%{release} URL: http://icl.cs.utk.edu/papi/ Source0: http://icl.cs.utk.edu/projects/papi/downloads/%{name}-%{version}.tar.gz Patch1: papi-python3.patch Patch5: papi-nostatic.patch -Patch6: papi-configure-c99-1.patch -Patch7: papi-configure-c99-2.patch BuildRequires: make BuildRequires: autoconf BuildRequires: doxygen @@ -95,10 +93,8 @@ the PAPI user-space libraries and interfaces. %prep %setup -q -%patch1 -p1 -b .python3 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 +%patch 1 -p1 -b .python3 +%patch 5 -p1 %build @@ -193,6 +189,9 @@ find %{buildroot} -type f -executable ! -iname "*.py" ! -iname "*.sh" | xargs ch %endif %changelog +* Thu Dec 21 2023 William Cohen - 7.1.0-1 +- Rebase to official papi-7.1.0. + * Mon Dec 18 2023 William Cohen - 7.0.1-7 - Fix i686 rawhide FTBFS. (rhbz#2254963) diff --git a/sources b/sources index d411b70..70d6f9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (papi-7.0.1.tar.gz) = 1d4ed80998e67f5c2f22057a8ab45598153ebe8ceca84a662686234cd0e0d015c353e7801915ec6b5c1c98d5c8ec38bca012d4094257bb80463cff9fe9523406 +SHA512 (papi-7.1.0.tar.gz) = 6ffe5f2c90bf699dcb937961ee0483e7edbb1909451d4bfcfe1949ad389b4089bbd7573b4055164fede9944d678e582c23a0cb74741c480e72e5e01b2061d0b0