diff --git a/libpfm-fix-const.patch b/libpfm-fix-const.patch deleted file mode 100644 index b9a2308..0000000 --- a/libpfm-fix-const.patch +++ /dev/null @@ -1,59 +0,0 @@ -From ded148888c501c2e9d21c23263d7c09aed4b97d6 Mon Sep 17 00:00:00 2001 -From: Aaron Merey -Date: Fri, 19 Dec 2025 12:33:33 -0500 -Subject: [PATCH] fix discarded const warning on newer gcc - ---- - lib/pfmlib_common.c | 15 +++++++++------ - tests/validate_x86.c | 2 +- - 2 files changed, 10 insertions(+), 7 deletions(-) - -diff --git a/lib/pfmlib_common.c b/lib/pfmlib_common.c -index 44b5de4..59a7cff 100644 ---- a/lib/pfmlib_common.c -+++ b/lib/pfmlib_common.c -@@ -1625,12 +1625,6 @@ pfmlib_parse_event(const char *event, pfmlib_event_desc_t *d) - const char *pname = NULL; - int i, j, ret; - -- /* -- * support only one event at a time. -- */ -- p = strpbrk(event, PFMLIB_EVENT_DELIM); -- if (p) -- return PFM_ERR_INVAL; - /* - * create copy because string is const - */ -@@ -1638,6 +1632,15 @@ pfmlib_parse_event(const char *event, pfmlib_event_desc_t *d) - if (!str) - return PFM_ERR_NOMEM; - -+ /* -+ * support only one event at a time. -+ */ -+ p = strpbrk(s, PFMLIB_EVENT_DELIM); -+ if (p) { -+ free(s); -+ return PFM_ERR_INVAL; -+ } -+ - - /* check for optional PMU name */ - p = strstr(s, PFMLIB_PMU_DELIM); -diff --git a/tests/validate_x86.c b/tests/validate_x86.c -index 500a697..68a776d 100644 ---- a/tests/validate_x86.c -+++ b/tests/validate_x86.c -@@ -8018,7 +8018,7 @@ static int - check_pmu_supported(const char *evt) - { - pfm_pmu_info_t info; -- char *p; -+ const char *p; - int ret; - pfm_pmu_t i; - --- -2.52.0 - diff --git a/libpfm.spec b/libpfm.spec index d7384ca..afcbc0d 100644 --- a/libpfm.spec +++ b/libpfm.spec @@ -9,14 +9,13 @@ Name: libpfm Version: 4.13.0 -Release: 17%{?dist} +Release: 10%{?dist} Summary: Library to encode performance events for use by perf tool License: MIT URL: http://perfmon2.sourceforge.net/ Source0: http://sourceforge.net/projects/perfmon2/files/libpfm4/%{name}-%{version}.tar.gz -Patch1: libpfm-fix-const.patch Patch2: libpfm-python3-setup.patch Patch3: libpfm-gcc14.patch @@ -72,7 +71,6 @@ Python bindings for libpfm4 and perf_event_open system call. %prep %setup -q -%patch -P1 -p1 -b .fix-const %patch -P2 -p1 -b .python3 %patch -P3 -p1 -b .gcc14 # to prevent setuptools from installing an .egg, we need to pass --root to setup.py install @@ -134,27 +132,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/lib*.a %endif %changelog -* Tue Dec 16 2025 Aaron Merey - 4.13.0-17 -- Add libpfm-fix-const.patch - -* Fri Sep 19 2025 Python Maint - 4.13.0-16 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Mon Aug 25 2025 Aaron Merey - 4.13.0-15 -- Fix path in tests/runtest.sh - -* Fri Aug 15 2025 Python Maint - 4.13.0-14 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Thu Jul 24 2025 Fedora Release Engineering - 4.13.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Jun 02 2025 Python Maint - 4.13.0-12 -- Rebuilt for Python 3.14 - -* Fri Jan 17 2025 Fedora Release Engineering - 4.13.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - * Thu Jul 18 2024 Fedora Release Engineering - 4.13.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/tests/libpfm-testsuite/runtest.sh b/tests/libpfm-testsuite/runtest.sh index a5997d6..7c8e03d 100755 --- a/tests/libpfm-testsuite/runtest.sh +++ b/tests/libpfm-testsuite/runtest.sh @@ -55,7 +55,7 @@ rlJournalStart rlRun "yum-builddep -y $TmpDir/SPECS/*.spec" rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/rpmbuild.log" - rlRun "cd \"$TmpDir\"/BUILD/libpfm-*-build/libpfm-*/tests 2>/dev/null || cd \"$TmpDir\"/BUILD/libpfm-*/tests" + rlRun "cd $TmpDir/BUILD/libpfm-*/tests" rlRun "su -c 'make PFMLIB=`rpm -ql libpfm | grep .so | head -n 1`' $BUILD_USER" rlRun "ldd validate | tee $TmpDir/ldd.log" rlRun "grep -q 'libpfm.so' $TmpDir/ldd.log"