aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-11-25 13:58:43 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-25 15:27:58 +0000
commitecc9bb098d69fb1b8920d8ecfaff5c9741859c4d (patch)
treed959b4fd293f958aea63259ce7d0ff0b08d60002
parentf9c647b4373e09e788580fd59c4c42a9bcec9268 (diff)
downloadopenembedded-core-contrib-ecc9bb098d69fb1b8920d8ecfaff5c9741859c4d.tar.gz
systemtap: fix do_compile failed on fedora21
For dora, the systemtap-native do_compile failed on fedora21 ... | In file included from /usr/include/stdio.h:27:0, | from tmp/work/x86_64-linux/systemtap-native/ 2.3+gitAUTOINC+e58138572e-r0/git/staprun/staprun.h:18, | from tmp/work/x86_64-linux/systemtap-native/ 2.3+gitAUTOINC+e58138572e-r0/git/staprun/staprun.c:24: | /usr/include/features.h:148:3: error: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Werror=cpp] | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" ... We backport a patch from 2.6 to fix this issue Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/0001-PR16632-Adapt-to-glibc-deprecation-of-_BSD_SOURCE-ad.patch27
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc1
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-PR16632-Adapt-to-glibc-deprecation-of-_BSD_SOURCE-ad.patch b/meta/recipes-kernel/systemtap/systemtap/0001-PR16632-Adapt-to-glibc-deprecation-of-_BSD_SOURCE-ad.patch
new file mode 100644
index 0000000000..df9b7c94cf
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/0001-PR16632-Adapt-to-glibc-deprecation-of-_BSD_SOURCE-ad.patch
@@ -0,0 +1,27 @@
+From 62379eedc739605f04d02e76eb50c4d2f129ae08 Mon Sep 17 00:00:00 2001
+From: "Frank Ch. Eigler" <fche@redhat.com>
+Date: Tue, 25 Nov 2014 13:45:14 +0800
+Subject: [PATCH] PR16632: Adapt to glibc deprecation of _BSD_SOURCE: add _DEFAULT_SOURCE
+
+Upstream-Status: Backport from commit c6278d012a483d97f5ee4756406d9c88735d2838
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ staprun/staprun.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/staprun/staprun.c b/staprun/staprun.c
+index b85e2b0..1e1b5c3 100644
+--- a/staprun/staprun.c
++++ b/staprun/staprun.c
+@@ -21,6 +21,7 @@
+
+ #define _XOPEN_SOURCE
+ #define _BSD_SOURCE
++#define _DEFAULT_SOURCE
+ #include "staprun.h"
+ #include "../privilege.h"
+ #include "../runtime/k_syms.h"
+--
+1.9.1
+
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index d8c6408e0f..2724c0e60f 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -7,6 +7,7 @@ PV = "2.3+git${SRCPV}"
SRC_URI = "git://sourceware.org/git/systemtap.git \
file://docproc-build-fix.patch \
file://obsolete_automake_macros.patch \
+ file://0001-PR16632-Adapt-to-glibc-deprecation-of-_BSD_SOURCE-ad.patch \
"
FILESPATH = "${FILE_DIRNAME}/systemtap"