diff --git a/papi-5.6.0.tar.gz b/papi-5.7.0.tar.gz similarity index 38% rename from papi-5.6.0.tar.gz rename to papi-5.7.0.tar.gz index 583afb72b0cf44b12b38c4105a66013b737e3ff1..236c9ce14e83ce2e80cf6ccb8ca856ba401cdfbf 100644 Binary files a/papi-5.6.0.tar.gz and b/papi-5.7.0.tar.gz differ diff --git a/papi-ldflags.patch b/papi-ldflags.patch deleted file mode 100644 index d2444588fca2c856edcc4bbd296c418c3c0c382b..0000000000000000000000000000000000000000 --- a/papi-ldflags.patch +++ /dev/null @@ -1,115 +0,0 @@ -commit bde3da26f1f2755689e16fc9f5ab404367d1fdc8 -Author: Vince Weaver -Date: Wed Jan 24 14:13:28 2018 -0500 - - build: fix various LDFLAGS/CFLAGS issues - - issues were reported by Andreas Beckmann - -diff --git a/src/components/Makefile_comp_tests.target.in b/src/components/Makefile_comp_tests.target.in -index 9a369adb..a4412bea 100644 ---- a/src/components/Makefile_comp_tests.target.in -+++ b/src/components/Makefile_comp_tests.target.in -@@ -9,7 +9,7 @@ INCLUDE = -I. -I@includedir@ -I$(datadir) -I$(testlibdir) -I$(validationlibdir) - LIBDIR = @libdir@ - PAPILIB = $(datadir)/@LIBRARY@ - TESTLIB = $(testlibdir)/libtestlib.a --LDFLAGS = @LDL@ -+LDFLAGS = @LDFLAGS@ @LDL@ - CC = @CC@ - F77 = @F77@ - CC_R = @CC_R@ -diff --git a/src/components/perf_event_uncore/tests/Makefile b/src/components/perf_event_uncore/tests/Makefile -index 3ee8fc2a..d70debe6 100644 ---- a/src/components/perf_event_uncore/tests/Makefile -+++ b/src/components/perf_event_uncore/tests/Makefile -@@ -17,19 +17,19 @@ perf_event_uncore_lib.o: perf_event_uncore_lib.c perf_event_uncore_lib.h - - - perf_event_amd_northbridge: perf_event_amd_northbridge.o $(DOLOOPS) $(UTILOBJS) $(PAPILIB) $(DOLOOPS) -- $(CC) $(LFLAGS) -o perf_event_amd_northbridge perf_event_amd_northbridge.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) -o perf_event_amd_northbridge perf_event_amd_northbridge.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS) - - perf_event_uncore: perf_event_uncore.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) perf_event_uncore_lib.o -- $(CC) $(LFLAGS) -o perf_event_uncore perf_event_uncore.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) -o perf_event_uncore perf_event_uncore.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS) - - perf_event_uncore_attach: perf_event_uncore_attach.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) perf_event_uncore_lib.o -- $(CC) $(LFLAGS) -o perf_event_uncore_attach perf_event_uncore_attach.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) -o perf_event_uncore_attach perf_event_uncore_attach.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS) - - perf_event_uncore_multiple: perf_event_uncore_multiple.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) -- $(CC) $(LFLAGS) $(INCLUDE) -o perf_event_uncore_multiple perf_event_uncore_multiple.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(INCLUDE) -o perf_event_uncore_multiple perf_event_uncore_multiple.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS) - - perf_event_uncore_cbox: perf_event_uncore_cbox.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) -- $(CC) $(LFLAGS) $(INCLUDE) -o perf_event_uncore_cbox perf_event_uncore_cbox.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(INCLUDE) -o perf_event_uncore_cbox perf_event_uncore_cbox.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS) - - - -diff --git a/src/ctests/Makefile.recipies b/src/ctests/Makefile.recipies -index 63c107c0..201f3c85 100644 ---- a/src/ctests/Makefile.recipies -+++ b/src/ctests/Makefile.recipies -@@ -350,7 +350,7 @@ code2name: code2name.c $(TESTLIB) $(PAPILIB) - $(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) code2name.c $(TESTLIB) $(PAPILIB) $(LDFLAGS) -o code2name - - attach_target: attach_target.c $(DOLOOPS) -- -$(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) attach_target.c -o attach_target $(DOLOOPS) $(TESTLIB) -+ -$(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) attach_target.c -o attach_target $(DOLOOPS) $(TESTLIB) $(LDFLAGS) - - zero_attach: zero_attach.c $(TESTLIB) $(DOLOOPS) $(PAPILIB) - -$(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) zero_attach.c $(TESTLIB) $(DOLOOPS) $(PAPILIB) $(LDFLAGS) -o zero_attach -diff --git a/src/ctests/Makefile.target.in b/src/ctests/Makefile.target.in -index bb51c350..fcc3373b 100644 ---- a/src/ctests/Makefile.target.in -+++ b/src/ctests/Makefile.target.in -@@ -12,7 +12,7 @@ LIBRARY=@LIBRARY@ - SHLIB=@SHLIB@ - PAPILIB = ../@LINKLIB@ - TESTLIB = $(testlibdir)/libtestlib.a --LDFLAGS = @LDL@ @STATIC@ -+LDFLAGS = @LDFLAGS@ @LDL@ @STATIC@ - CC = @CC@ - MPICC = @MPICC@ - F77 = @F77@ -diff --git a/src/ftests/Makefile.target.in b/src/ftests/Makefile.target.in -index 718586e5..8006dd8d 100644 ---- a/src/ftests/Makefile.target.in -+++ b/src/ftests/Makefile.target.in -@@ -11,7 +11,7 @@ LIBRARY = @LIBRARY@ - SHLIB=@SHLIB@ - PAPILIB = ../@LINKLIB@ - TESTLIB = $(testlibdir)/libtestlib.a --LDFLAGS = @LDL@ -+LDFLAGS = @LDFLAGS@ @LDL@ - CC = @CC@ - F77 = @F77@ - CC_R = @CC_R@ -diff --git a/src/utils/Makefile.target.in b/src/utils/Makefile.target.in -index a5eab438..58d438a1 100644 ---- a/src/utils/Makefile.target.in -+++ b/src/utils/Makefile.target.in -@@ -11,7 +11,7 @@ LIBRARY=@LIBRARY@ - SHLIB=@SHLIB@ - PAPILIB = ../@LINKLIB@ - TESTLIB = $(testlibdir)/libtestlib.a --LDFLAGS = @LDL@ @STATIC@ -+LDFLAGS = @LDFLAGS@ @LDL@ @STATIC@ - CC = @CC@ - MPICC = @MPICC@ - F77 = @F77@ -diff --git a/src/validation_tests/Makefile.target.in b/src/validation_tests/Makefile.target.in -index a5eab438..58d438a1 100644 ---- a/src/validation_tests/Makefile.target.in -+++ b/src/validation_tests/Makefile.target.in -@@ -11,7 +11,7 @@ LIBRARY=@LIBRARY@ - SHLIB=@SHLIB@ - PAPILIB = ../@LINKLIB@ - TESTLIB = $(testlibdir)/libtestlib.a --LDFLAGS = @LDL@ @STATIC@ -+LDFLAGS = @LDFLAGS@ @LDL@ @STATIC@ - CC = @CC@ - MPICC = @MPICC@ - F77 = @F77@ diff --git a/papi.spec b/papi.spec index 5a3fb3615936b4b21a21aae51af5fedbfb62321b..e2d1760789ef91f036bb0b36caa9f0d7e2acc1b0 100644 --- a/papi.spec +++ b/papi.spec @@ -1,6 +1,6 @@ Name: papi -Version: 5.6.0 -Release: 9 +Version: 5.7.0 +Release: 1 Summary: Performance Application Programming Interface License: BSD URL: http://icl.cs.utk.edu/papi/ @@ -12,8 +12,6 @@ Provides: papi-libs = %{version}-%{release} Obsoletes: papi-libs < %{version}-%{release} Recommends: %{name}-help = %{version}-%{release} -Patch0001: papi-ldflags.patch - %description PAPI provides a programmer interface to monitor the performance of running programs,and contains the run-time libraries for any application that wishes @@ -88,6 +86,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so* %{_mandir}/man3/* %changelog +* Mon Feb 13 2023 liyanan - 5.7.0-1 +- Update to 5.7.0 + * Thu Nov 12 2020 xinghe - 5.6.0-9 - add help for Recommends