Properly apply exported CFLAGS for dtrace/systemtap builds
Fixes: rhbz#2356304
This commit is contained in:
Charalampos Stratakis
parent
e575a4e5ce
commit
b696aebe3d
2 changed files with 69 additions and 1 deletions
|
|
@ -0,0 +1,52 @@
|
||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Miss Islington (bot)"
|
||||||
|
<31488909+miss-islington@users.noreply.github.com>
|
||||||
|
Date: Mon, 31 Mar 2025 20:29:04 +0200
|
||||||
|
Subject: [PATCH] 00452: Properly apply exported CFLAGS for dtrace/systemtap
|
||||||
|
builds
|
||||||
|
|
||||||
|
When using --with-dtrace the resulting object file could be missing
|
||||||
|
specific CFLAGS exported by the build system due to the systemtap
|
||||||
|
script using specific defaults.
|
||||||
|
|
||||||
|
Exporting the CC and CFLAGS variables before the dtrace invocation
|
||||||
|
allows us to properly apply CFLAGS exported by the build system
|
||||||
|
even when cross-compiling.
|
||||||
|
|
||||||
|
Co-authored-by: stratakis <cstratak@redhat.com>
|
||||||
|
---
|
||||||
|
Makefile.pre.in | 4 ++--
|
||||||
|
.../next/Build/2025-03-31-19-22-41.gh-issue-131865.PIJy7X.rst | 2 ++
|
||||||
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||||
|
create mode 100644 Misc/NEWS.d/next/Build/2025-03-31-19-22-41.gh-issue-131865.PIJy7X.rst
|
||||||
|
|
||||||
|
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||||
|
index 568018827b..b401724d92 100644
|
||||||
|
--- a/Makefile.pre.in
|
||||||
|
+++ b/Makefile.pre.in
|
||||||
|
@@ -989,7 +989,7 @@ Python/frozen.o: $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib_externa
|
||||||
|
# an include guard, so we can't use a pipeline to transform its output.
|
||||||
|
Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d
|
||||||
|
$(MKDIR_P) Include
|
||||||
|
- $(DTRACE) $(DFLAGS) -o $@ -h -s $<
|
||||||
|
+ CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) $(DFLAGS) -o $@ -h -s $<
|
||||||
|
: sed in-place edit with POSIX-only tools
|
||||||
|
sed 's/PYTHON_/PyDTrace_/' $@ > $@.tmp
|
||||||
|
mv $@.tmp $@
|
||||||
|
@@ -999,7 +999,7 @@ Python/import.o: $(srcdir)/Include/pydtrace.h
|
||||||
|
Modules/gcmodule.o: $(srcdir)/Include/pydtrace.h
|
||||||
|
|
||||||
|
Python/pydtrace.o: $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS)
|
||||||
|
- $(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS)
|
||||||
|
+ CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS)
|
||||||
|
|
||||||
|
Objects/typeobject.o: Objects/typeslots.inc
|
||||||
|
|
||||||
|
diff --git a/Misc/NEWS.d/next/Build/2025-03-31-19-22-41.gh-issue-131865.PIJy7X.rst b/Misc/NEWS.d/next/Build/2025-03-31-19-22-41.gh-issue-131865.PIJy7X.rst
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..a287e0b228
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/Misc/NEWS.d/next/Build/2025-03-31-19-22-41.gh-issue-131865.PIJy7X.rst
|
||||||
|
@@ -0,0 +1,2 @@
|
||||||
|
+The DTrace build now properly passes the ``CC`` and ``CFLAGS`` variables
|
||||||
|
+to the ``dtrace`` command when utilizing SystemTap on Linux.
|
||||||
|
|
@ -17,7 +17,7 @@ URL: https://www.python.org/
|
||||||
#global prerel ...
|
#global prerel ...
|
||||||
%global upstream_version %{general_version}%{?prerel}
|
%global upstream_version %{general_version}%{?prerel}
|
||||||
Version: %{general_version}%{?prerel:~%{prerel}}
|
Version: %{general_version}%{?prerel:~%{prerel}}
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
License: Python
|
License: Python
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -401,6 +401,18 @@ Patch438: 00438-fix-threadedvsocksocketstreamtest-gh-119465-gh-119479-119484.pat
|
||||||
# CVE-2025-0938: Disallow square brackets ([ and ]) in domain names for parsed URLs
|
# CVE-2025-0938: Disallow square brackets ([ and ]) in domain names for parsed URLs
|
||||||
Patch450: 00450-cve-2025-0938-disallow-square-brackets-and-in-domain-names-for-parsed-urls.patch
|
Patch450: 00450-cve-2025-0938-disallow-square-brackets-and-in-domain-names-for-parsed-urls.patch
|
||||||
|
|
||||||
|
# 00452 # eb11d070c5af7d1b5e47f4e02186152d08eaf793
|
||||||
|
# Properly apply exported CFLAGS for dtrace/systemtap builds
|
||||||
|
#
|
||||||
|
# When using --with-dtrace the resulting object file could be missing
|
||||||
|
# specific CFLAGS exported by the build system due to the systemtap
|
||||||
|
# script using specific defaults.
|
||||||
|
#
|
||||||
|
# Exporting the CC and CFLAGS variables before the dtrace invocation
|
||||||
|
# allows us to properly apply CFLAGS exported by the build system
|
||||||
|
# even when cross-compiling.
|
||||||
|
Patch452: 00452-properly-apply-exported-cflags-for-dtrace-systemtap-builds.patch
|
||||||
|
|
||||||
# (New patches go here ^^^)
|
# (New patches go here ^^^)
|
||||||
#
|
#
|
||||||
# When adding new patches to "python" and "python3" in Fedora, EL, etc.,
|
# When adding new patches to "python" and "python3" in Fedora, EL, etc.,
|
||||||
|
|
@ -1848,6 +1860,10 @@ CheckPython optimized
|
||||||
# ======================================================
|
# ======================================================
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Mar 31 2025 Charalampos Stratakis <cstratak@redhat.com> - 3.9.21-5
|
||||||
|
- Properly apply exported CFLAGS for dtrace/systemtap builds
|
||||||
|
- Fixes: rhbz#2356304
|
||||||
|
|
||||||
* Mon Feb 10 2025 Charalampos Stratakis <cstratak@redhat.com> - 3.9.21-4
|
* Mon Feb 10 2025 Charalampos Stratakis <cstratak@redhat.com> - 3.9.21-4
|
||||||
- Security fix for CVE-2025-0938
|
- Security fix for CVE-2025-0938
|
||||||
- Fixes: rhbz#2343278
|
- Fixes: rhbz#2343278
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue