summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-04-13 19:56:02 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-14 08:33:47 (GMT)
commit3e3f774b8df4c54c277f5e981f4b83dd67ff49a3 (patch)
treea0ee79da35e872b63b8a8d280c8813dae8861547 /meta/recipes-kernel
parentee71422b9893f9f77173fb2612d1ffbbc68643c3 (diff)
downloadpoky-3e3f774b8df4c54c277f5e981f4b83dd67ff49a3.tar.gz
systemtap: fix docproc build error
When building docs in systemtap, docproc is used to generate the tapset documentation, but it gets built for the target, while it needs to be build for the host instead. This change causes that to happen. Fixes [YOCTO #2193]. (From OE-Core rev: 6ef7112e339bb5c03dee862bc56c10fdf677be78) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch19
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.bb6
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc4
3 files changed, 27 insertions, 2 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch b/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch
new file mode 100644
index 0000000..33a8994
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch
@@ -0,0 +1,19 @@
1Upstream-Status: Inappropriate [configuration]
2
3Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
4
5Index: git/doc/SystemTap_Tapset_Reference/Makefile.am
6===================================================================
7--- git.orig/doc/SystemTap_Tapset_Reference/Makefile.am 2012-04-13 08:43:46.263339003 -0500
8+++ git/doc/SystemTap_Tapset_Reference/Makefile.am 2012-04-13 09:31:22.470083915 -0500
9@@ -27,6 +27,10 @@
10 noinst_PROGRAMS = docproc
11 SRCTREE=$(abs_top_srcdir)/
12 DOCPROC=$(abs_builddir)/docproc
13+docproc_LINK = $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
14+
15+docproc.o: $(srcdir)/docproc.c
16+ $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/docproc.c
17
18 all: $(PDFDOCS) stamp-htmldocs stamp-mandocs
19 tapsets.xml: docproc $(shell find $(SRCTREE)/tapset -name '*.stp')
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index c4a9d87..1d2c9f3 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -6,7 +6,11 @@ DEPENDS = "elfutils sqlite3 systemtap-native"
6DEPENDS_virtclass-native = "elfutils-native sqlite3-native gettext-native" 6DEPENDS_virtclass-native = "elfutils-native sqlite3-native gettext-native"
7DEPENDS_virtclass-nativesdk = "elfutils-nativesdk sqlite3-nativesdk gettext-nativesdk" 7DEPENDS_virtclass-nativesdk = "elfutils-nativesdk sqlite3-nativesdk gettext-nativesdk"
8 8
9PR = "r2" 9PR = "r3"
10
11export CC_FOR_BUILD = "${BUILD_CC}"
12export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
13export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS}"
10 14
11EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \ 15EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
12 ac_cv_file__usr_include_nss=no \ 16 ac_cv_file__usr_include_nss=no \
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index cc250ff..c4d6e34 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -4,7 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
4SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81" 4SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81"
5PV = "1.7+git${SRCPV}" 5PV = "1.7+git${SRCPV}"
6 6
7SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" 7SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git \
8 file://docproc-build-fix.patch \
9 "
8 10
9SRC_URI[md5sum] = "cb202866ed704c44a876d041f788bdee" 11SRC_URI[md5sum] = "cb202866ed704c44a876d041f788bdee"
10SRC_URI[sha256sum] = "8ffe35caec0d937bd23fd78a3a8d94b58907cc0de0330b35e38f9f764815c459" 12SRC_URI[sha256sum] = "8ffe35caec0d937bd23fd78a3a8d94b58907cc0de0330b35e38f9f764815c459"