summaryrefslogtreecommitdiffstats
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:28:54 +0000
commit9b385da2f08bfabf8a80d5782f4c8622d02cdfc7 (patch)
tree4134aaf25c158d464a4b8dbbf3402172810877c6
parent12dd4279c59c9c8dd08e42ebfaa1e6b611341aa1 (diff)
downloadpoky-9b385da2f08bfabf8a80d5782f4c8622d02cdfc7.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 (From OE-Core rev: ecc9bb098d69fb1b8920d8ecfaff5c9741859c4d) 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 @@
1From 62379eedc739605f04d02e76eb50c4d2f129ae08 Mon Sep 17 00:00:00 2001
2From: "Frank Ch. Eigler" <fche@redhat.com>
3Date: Tue, 25 Nov 2014 13:45:14 +0800
4Subject: [PATCH] PR16632: Adapt to glibc deprecation of _BSD_SOURCE: add _DEFAULT_SOURCE
5
6Upstream-Status: Backport from commit c6278d012a483d97f5ee4756406d9c88735d2838
7
8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
9---
10 staprun/staprun.c | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/staprun/staprun.c b/staprun/staprun.c
14index b85e2b0..1e1b5c3 100644
15--- a/staprun/staprun.c
16+++ b/staprun/staprun.c
17@@ -21,6 +21,7 @@
18
19 #define _XOPEN_SOURCE
20 #define _BSD_SOURCE
21+#define _DEFAULT_SOURCE
22 #include "staprun.h"
23 #include "../privilege.h"
24 #include "../runtime/k_syms.h"
25--
261.9.1
27
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}"
7SRC_URI = "git://sourceware.org/git/systemtap.git \ 7SRC_URI = "git://sourceware.org/git/systemtap.git \
8 file://docproc-build-fix.patch \ 8 file://docproc-build-fix.patch \
9 file://obsolete_automake_macros.patch \ 9 file://obsolete_automake_macros.patch \
10 file://0001-PR16632-Adapt-to-glibc-deprecation-of-_BSD_SOURCE-ad.patch \
10 " 11 "
11 12
12FILESPATH = "${FILE_DIRNAME}/systemtap" 13FILESPATH = "${FILE_DIRNAME}/systemtap"