Rebase to official papi-7.0.1. (rhbz#2177906)
This commit is contained in:
parent
5f2c48e85c
commit
bf21e8d506
1
.gitignore
vendored
1
.gitignore
vendored
@ -25,3 +25,4 @@ papi-4.1.0.tar.gz
|
||||
/papi-5.7.0.tar.gz
|
||||
/papi-6.0.0.tar.gz
|
||||
/papi-7.0.0.tar.gz
|
||||
/papi-7.0.1.tar.gz
|
||||
|
@ -1,87 +0,0 @@
|
||||
Avoid implicit ints and implicit function declarations. This patch
|
||||
needs to be upstreamed because it is custom, papi-specific autoconf
|
||||
checks.
|
||||
|
||||
diff --git a/src/configure b/src/configure
|
||||
index 78dab84107dc897e..99c8f63bd020d3df 100755
|
||||
--- a/src/configure
|
||||
+++ b/src/configure
|
||||
@@ -4985,7 +4985,8 @@ $as_echo_n "checking for working gettid... " >&6; }
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <sys/types.h>
|
||||
- main() { pid_t a = gettid(); }
|
||||
+ #include <unistd.h>
|
||||
+ int main() { pid_t a = gettid(); }
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
@@ -5002,7 +5003,8 @@ $as_echo_n "checking for working syscall(SYS_gettid)... " >&6; }
|
||||
/* end confdefs.h. */
|
||||
#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); }
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
@@ -5080,7 +5082,7 @@ else
|
||||
#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);
|
||||
@@ -5115,7 +5117,7 @@ else
|
||||
#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);
|
||||
diff --git a/src/configure.in b/src/configure.in
|
||||
index efcbd59405ac42bc..686b489f10c86839 100644
|
||||
--- a/src/configure.in
|
||||
+++ b/src/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);
|
@ -10,15 +10,14 @@
|
||||
%{!?with_pcp: %global with_pcp 1}
|
||||
Summary: Performance Application Programming Interface
|
||||
Name: papi
|
||||
Version: 7.0.0
|
||||
Release: 3%{?dist}
|
||||
Version: 7.0.1
|
||||
Release: 1%{?dist}
|
||||
License: BSD
|
||||
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.patch
|
||||
BuildRequires: make
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: doxygen
|
||||
@ -88,7 +87,6 @@ the PAPI user-space libraries and interfaces.
|
||||
%setup -q
|
||||
%patch1 -p1 -b .python3
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
|
||||
%build
|
||||
|
||||
@ -183,6 +181,9 @@ find %{buildroot} -type f -executable ! -iname "*.py" ! -iname "*.sh" | xargs ch
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Mar 14 2023 William Cohen <wcohen@redhat.com> - 7.0.1-1
|
||||
- Rebase to official papi-7.0.1. (rhbz#2177906)
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (papi-7.0.0.tar.gz) = 4c5d5eef5c89e72c41fa44eb384e66a615957ac6cbc56c9f80bdca297589808ead854389b4414f14c157d5ff5b70001126c3ba33aba0557277a801e49ef44403
|
||||
SHA512 (papi-7.0.1.tar.gz) = 1d4ed80998e67f5c2f22057a8ab45598153ebe8ceca84a662686234cd0e0d015c353e7801915ec6b5c1c98d5c8ec38bca012d4094257bb80463cff9fe9523406
|
||||
|
Loading…
Reference in New Issue
Block a user