Patchwork systemtap: Systemtap can not be build w -O0 optimization

login
register
mail settings
Submitter Mark Hatle
Date June 24, 2013, 2:44 p.m.
Message ID <1372085096-30468-1-git-send-email-mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/52285/
State Accepted
Commit 65385d4bb92c8938a48281462448d1efc6123920
Headers show

Comments

Mark Hatle - June 24, 2013, 2:44 p.m.
Systemtap will fail with:

../usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp]
|  #  warning _FORTIFY_SOURCE requires compiling with optimization (-O)

Use the same technique that eglibc uses to catch and correct the optimization
level, changing to -O2.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/recipes-kernel/systemtap/systemtap_git.inc | 11 +++++++++++
 1 file changed, 11 insertions(+)

Patch

diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index edaab97..7be6c2b 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -19,3 +19,14 @@  COMPATIBLE_HOST = '(x86_64.*|i.86.*|powerpc.*|arm.*)-linux'
 
 S = "${WORKDIR}/git"
 
+# systemtap can't be built without optimization, if someone tries to compile an
+# entire image as -O0, we override it with -O2 here and give a note about it.
+def get_optimization(d):
+    selected_optimization = d.getVar("SELECTED_OPTIMIZATION", True)
+    if base_contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x":
+        bb.note("systemtap can't be built with -O0, -O2 will be used instead.")
+        return selected_optimization.replace("-O0", "-O2")
+    return selected_optimization
+
+SELECTED_OPTIMIZATION := "${@get_optimization(d)}"
+