rpms/papi
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to official papi-7.1.0.

Browse Source
This commit is contained in:
William Cohen 2023-12-21 10:28:20 -05:00
parent 7495b50198
commit a4a7d44d6d
5 changed files with 9 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -26,3 +26,4 @@ papi-4.1.0.tar.gz
/papi-6.0.0.tar.gz /papi-6.0.0.tar.gz
/papi-7.0.0.tar.gz /papi-7.0.0.tar.gz
/papi-7.0.1.tar.gz /papi-7.0.1.tar.gz
/papi-7.1.0.tar.gz

73
papi-configure-c99-1.patch
View File

@ -1,73 +0,0 @@
commit dd11311aadbd06ab6c76d49a997a8bb2bcdcd5f7
Author: Giuseppe Congiu <gcongiu@icl.utk.edu>
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 <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)
@@ -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 <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;

55
papi-configure-c99-2.patch
View File

@ -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: <https://github.com/icl-utk-edu/papi/pull/142>
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 ) {

11
papi.spec
View File

@ -14,16 +14,14 @@
%endif %endif
Summary: Performance Application Programming Interface Summary: Performance Application Programming Interface
Name: papi Name: papi
Version: 7.0.1 Version: 7.1.0
Release: 7%{?dist} Release: 1%{?dist}
License: BSD-3-Clause License: BSD-3-Clause
Requires: papi-libs = %{version}-%{release} Requires: papi-libs = %{version}-%{release}
URL: http://icl.cs.utk.edu/papi/ URL: http://icl.cs.utk.edu/papi/
Source0: http://icl.cs.utk.edu/projects/papi/downloads/%{name}-%{version}.tar.gz Source0: http://icl.cs.utk.edu/projects/papi/downloads/%{name}-%{version}.tar.gz
Patch1: papi-python3.patch Patch1: papi-python3.patch
Patch5: papi-nostatic.patch Patch5: papi-nostatic.patch
Patch6: papi-configure-c99-1.patch
Patch7: papi-configure-c99-2.patch
BuildRequires: make BuildRequires: make
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: doxygen BuildRequires: doxygen
@ -97,8 +95,6 @@ the PAPI user-space libraries and interfaces.
%setup -q %setup -q
%patch 1 -p1 -b .python3 %patch 1 -p1 -b .python3
%patch 5 -p1 %patch 5 -p1
%patch6 -p1
%patch7 -p1
%build %build
@ -193,6 +189,9 @@ find %{buildroot} -type f -executable ! -iname "*.py" ! -iname "*.sh" | xargs ch
%endif %endif
%changelog %changelog
* Thu Dec 21 2023 William Cohen <wcohen@redhat.com> - 7.1.0-1
- Rebase to official papi-7.1.0.
* Mon Dec 18 2023 William Cohen <wcohen@redhat.com> - 7.0.1-7 * Mon Dec 18 2023 William Cohen <wcohen@redhat.com> - 7.0.1-7
- Fix i686 rawhide FTBFS. (rhbz#2254963) - Fix i686 rawhide FTBFS. (rhbz#2254963)

2
sources
View File

@ -1 +1 @@
SHA512 (papi-7.0.1.tar.gz) = 1d4ed80998e67f5c2f22057a8ab45598153ebe8ceca84a662686234cd0e0d015c353e7801915ec6b5c1c98d5c8ec38bca012d4094257bb80463cff9fe9523406 SHA512 (papi-7.1.0.tar.gz) = 6ffe5f2c90bf699dcb937961ee0483e7edbb1909451d4bfcfe1949ad389b4089bbd7573b4055164fede9944d678e582c23a0cb74741c480e72e5e01b2061d0b0