Compare commits

..

1 commit

Author SHA1 Message Date
Aaron Merey
7581f96112
Add libpfm-fix-const.patch 2025-12-19 13:30:35 -05:00
2 changed files with 65 additions and 1 deletions

59
libpfm-fix-const.patch Normal file
View file

@ -0,0 +1,59 @@
From ded148888c501c2e9d21c23263d7c09aed4b97d6 Mon Sep 17 00:00:00 2001
From: Aaron Merey <amerey@redhat.com>
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

View file

@ -9,13 +9,14 @@
Name: libpfm
Version: 4.13.0
Release: 16%{?dist}
Release: 17%{?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
@ -71,6 +72,7 @@ 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
@ -132,6 +134,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/lib*.a
%endif
%changelog
* Tue Dec 16 2025 Aaron Merey <amerey@redhat.com> - 4.13.0-17
- Add libpfm-fix-const.patch
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 4.13.0-16
- Rebuilt for Python 3.14.0rc3 bytecode