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

Resolves: RHEL-43481

Browse Source
This commit is contained in:
Martin Cermak 2024-07-26 10:06:48 +02:00
parent 655376a8ee
commit 0a5fe0416d
2 changed files with 76 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
RHEL-43481.patch Normal file
View File

@ -0,0 +1,70 @@
diff --git a/python/Makefile.am b/python/Makefile.am
index a254480f9..13618dc2f 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -29,12 +29,12 @@ pkglibexecpython_DATA += stap-resolve-module-function.py
all-local:
if HAVE_PYTHON2_PROBES
- (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON) setup.py build \
+ (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON) setup.py build \
--build-base $(shell readlink -f $(builddir))/py2build \
--verbose)
endif
if HAVE_PYTHON3_PROBES
- (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON3) setup.py build \
+ (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON3) setup.py build \
--build-base $(shell readlink -f $(builddir))/py3build \
--verbose)
endif
@@ -45,7 +45,7 @@ endif
# and we need to keep separate build directories for python 2 and 3.
install-exec-local:
if HAVE_PYTHON2_PROBES
- (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON) setup.py build \
+ (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON) setup.py build \
--build-base $(shell readlink -f $(builddir))/py2build \
install --prefix $(DESTDIR)$(prefix) \
--single-version-externally-managed \
@@ -53,7 +53,7 @@ if HAVE_PYTHON2_PROBES
--verbose)
endif
if HAVE_PYTHON3_PROBES
- (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON3) setup.py build \
+ (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON3) setup.py build \
--build-base $(shell readlink -f $(builddir))/py3build \
install --prefix $(DESTDIR)$(prefix) \
--single-version-externally-managed \
diff --git a/python/Makefile.in b/python/Makefile.in
index 1216eefff..62fe2129c 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -624,10 +624,10 @@ uninstall-am: uninstall-pkglibexecpythonDATA \
@HAVE_PYTHON_PROBES_TRUE@all-local:
-@HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON) setup.py build \
+@HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON) setup.py build \
@HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ --build-base $(shell readlink -f $(builddir))/py2build \
@HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ --verbose)
-@HAVE_PYTHON3_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON3) setup.py build \
+@HAVE_PYTHON3_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON3) setup.py build \
@HAVE_PYTHON3_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ --build-base $(shell readlink -f $(builddir))/py3build \
@HAVE_PYTHON3_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ --verbose)
@@ -635,13 +635,13 @@ uninstall-am: uninstall-pkglibexecpythonDATA \
# since only the build command has the '--build-base' directory option
# and we need to keep separate build directories for python 2 and 3.
@HAVE_PYTHON_PROBES_TRUE@install-exec-local:
-@HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON) setup.py build \
+@HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON) setup.py build \
@HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ --build-base $(shell readlink -f $(builddir))/py2build \
@HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ install --prefix $(DESTDIR)$(prefix) \
@HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ --single-version-externally-managed \
@HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ --record $(shell readlink -f $(builddir))/py2build/install_files.txt \
@HAVE_PYTHON2_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ --verbose)
-@HAVE_PYTHON3_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON3) setup.py build \
+@HAVE_PYTHON3_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON3) setup.py build \
@HAVE_PYTHON3_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ --build-base $(shell readlink -f $(builddir))/py3build \
@HAVE_PYTHON3_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ install --prefix $(DESTDIR)$(prefix) \
@HAVE_PYTHON3_PROBES_TRUE@@HAVE_PYTHON_PROBES_TRUE@ --single-version-externally-managed \

7
systemtap.spec
View File

@ -121,7 +121,7 @@ m stapdev stapdev
Name: systemtap Name: systemtap
# PRERELEASE # PRERELEASE
Version: 5.1 Version: 5.1
Release: 7%{?release_override}%{?dist} Release: 8%{?release_override}%{?dist}
# for version, see also configure.ac # for version, see also configure.ac
@ -162,6 +162,7 @@ Patch2: RHEL-36201b.patch
Patch3: PR31495.patch Patch3: PR31495.patch
Patch4: RHEL-42605.patch Patch4: RHEL-42605.patch
Patch5: RHEL-50107.patch Patch5: RHEL-50107.patch
Patch6: RHEL-43481.patch
# Build* # Build*
BuildRequires: make BuildRequires: make
@ -593,6 +594,7 @@ or within a container.
%patch -P3 -p1 %patch -P3 -p1
%patch -P4 -p1 %patch -P4 -p1
%patch -P5 -p1 %patch -P5 -p1
%patch -P6 -p1
%build %build
@ -1320,6 +1322,9 @@ exit 0
# PRERELEASE # PRERELEASE
%changelog %changelog
* Fri Jul 26 2024 Martin Cermak <mcermak@redhat.com> - 5.1-8
- RHEL-43481
* Wed Jul 24 2024 Martin Cermak <mcermak@redhat.com> - 5.1-7 * Wed Jul 24 2024 Martin Cermak <mcermak@redhat.com> - 5.1-7
- RHEL-50107 - RHEL-50107