Skip to content

Commit 5f6d408

Browse files
kanavinrpurdie
authored andcommitted
systemtap: correctly set include location for the python module
This issue was as well exposed by setting S to be in UNPACKDIR. Signed-off-by: Alexander Kanavin <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]>
1 parent 023d644 commit 5f6d408

File tree

2 files changed

+37
-0
lines changed

2 files changed

+37
-0
lines changed
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
From 71e4ffd46dbbb7de1d06edb66f3e1fe0de423586 Mon Sep 17 00:00:00 2001
2+
From: Alexander Kanavin <[email protected]>
3+
Date: Wed, 21 May 2025 13:25:46 +0200
4+
Subject: [PATCH] python/Makefile.am: use absolute path for source directory
5+
includes as well
6+
7+
Otherwise it would be relative to the build directory,
8+
which works only if the build and source directory are in the
9+
same parent directory, and breaks if they're on different levels.
10+
11+
Upstream-Status: Submitted [by email to [email protected],[email protected],[email protected]]
12+
Signed-off-by: Alexander Kanavin <[email protected]>
13+
---
14+
python/Makefile.am | 4 ++--
15+
1 file changed, 2 insertions(+), 2 deletions(-)
16+
17+
diff --git a/python/Makefile.am b/python/Makefile.am
18+
index 9d5cb7bcb..130e90b24 100644
19+
--- a/python/Makefile.am
20+
+++ b/python/Makefile.am
21+
@@ -2,10 +2,10 @@
22+
23+
AUTOMAKE_OPTIONS = subdir-objects
24+
25+
-# Note that we have to use 'abs_builddir' here since we change
26+
+# Note that we have to use absolute directores here since we change
27+
# directories back to the source directory when building the python
28+
# extension.
29+
-AM_CPPFLAGS = -I$(srcdir)/../includes
30+
+AM_CPPFLAGS = -I$(abs_srcdir)/../includes
31+
AM_CPPFLAGS += -I$(abs_builddir)/../includes/sys
32+
33+
# Add OE's CFLAGS which contains `-fdebug-prefix-map' options to
34+
--
35+
2.39.5
36+

meta/recipes-kernel/systemtap/systemtap_5.2.bb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ require systemtap_git.inc
99
SRC_URI += " \
1010
file://0001-improve-reproducibility-for-c-compiling.patch \
1111
file://0001-staprun-address-ncurses-6.3-failures.patch \
12+
file://0001-python-Makefile.am-use-absolute-path-for-source-dire.patch \
1213
"
1314

1415
DEPENDS = "elfutils"

0 commit comments

Comments
 (0)