* [PATCH 0/2] systemtap doc build fix
@ 2012-04-13 19:55 tom.zanussi
2012-04-13 19:56 ` [PATCH 1/2] systemtap: fix docproc build error tom.zanussi
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: tom.zanussi @ 2012-04-13 19:55 UTC (permalink / raw)
To: openembedded-core
From: Tom Zanussi <tom.zanussi@intel.com>
This patchset fixes a documentation build problem with docproc, then
turns documentation generation off by default, since when it works,
it adds a lot to the build time.
The following changes since commit 04b16f1038f7cae445d741e86c2cc19c70f991c1:
Andrei Gherzan (1):
rpm-native: Compile python rpm module (with-python)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib.git tzanussi/2193-fix
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/2193-fix
Tom Zanussi (2):
systemtap: fix docproc build error
systemtap: disable document generation by default
.../systemtap/systemtap/docproc-build-fix.patch | 19 +++++++++++++++++++
meta/recipes-kernel/systemtap/systemtap_git.bb | 10 +++++++++-
meta/recipes-kernel/systemtap/systemtap_git.inc | 4 +++-
3 files changed, 31 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/2] systemtap: fix docproc build error
2012-04-13 19:55 [PATCH 0/2] systemtap doc build fix tom.zanussi
@ 2012-04-13 19:56 ` tom.zanussi
2012-04-14 13:39 ` Richard Purdie
2012-04-13 19:56 ` [PATCH 2/2] systemtap: disable document generation by default tom.zanussi
2012-04-16 15:40 ` [PATCH 0/2] systemtap doc build fix Saul Wold
2 siblings, 1 reply; 5+ messages in thread
From: tom.zanussi @ 2012-04-13 19:56 UTC (permalink / raw)
To: openembedded-core
From: Tom Zanussi <tom.zanussi@intel.com>
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].
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
.../systemtap/systemtap/docproc-build-fix.patch | 19 +++++++++++++++++++
meta/recipes-kernel/systemtap/systemtap_git.bb | 6 +++++-
meta/recipes-kernel/systemtap/systemtap_git.inc | 4 +++-
3 files changed, 27 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch
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 @@
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
+
+Index: git/doc/SystemTap_Tapset_Reference/Makefile.am
+===================================================================
+--- git.orig/doc/SystemTap_Tapset_Reference/Makefile.am 2012-04-13 08:43:46.263339003 -0500
++++ git/doc/SystemTap_Tapset_Reference/Makefile.am 2012-04-13 09:31:22.470083915 -0500
+@@ -27,6 +27,10 @@
+ noinst_PROGRAMS = docproc
+ SRCTREE=$(abs_top_srcdir)/
+ DOCPROC=$(abs_builddir)/docproc
++docproc_LINK = $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
++
++docproc.o: $(srcdir)/docproc.c
++ $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/docproc.c
+
+ all: $(PDFDOCS) stamp-htmldocs stamp-mandocs
+ 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"
DEPENDS_virtclass-native = "elfutils-native sqlite3-native gettext-native"
DEPENDS_virtclass-nativesdk = "elfutils-nativesdk sqlite3-nativesdk gettext-nativesdk"
-PR = "r2"
+PR = "r3"
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
+export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS}"
EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
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"
SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81"
PV = "1.7+git${SRCPV}"
-SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git"
+SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git \
+ file://docproc-build-fix.patch \
+ "
SRC_URI[md5sum] = "cb202866ed704c44a876d041f788bdee"
SRC_URI[sha256sum] = "8ffe35caec0d937bd23fd78a3a8d94b58907cc0de0330b35e38f9f764815c459"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] systemtap: disable document generation by default
2012-04-13 19:55 [PATCH 0/2] systemtap doc build fix tom.zanussi
2012-04-13 19:56 ` [PATCH 1/2] systemtap: fix docproc build error tom.zanussi
@ 2012-04-13 19:56 ` tom.zanussi
2012-04-16 15:40 ` [PATCH 0/2] systemtap doc build fix Saul Wold
2 siblings, 0 replies; 5+ messages in thread
From: tom.zanussi @ 2012-04-13 19:56 UTC (permalink / raw)
To: openembedded-core
From: Tom Zanussi <tom.zanussi@intel.com>
Building the systemtap documentation adds significantly to the build
time, so disable it by default.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta/recipes-kernel/systemtap/systemtap_git.bb | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 1d2c9f3..91bccd1 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -20,6 +20,10 @@ EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
ac_cv_file__usr_include_avahi_client=no \
ac_cv_file__usr_include_avahi_common=no "
+STAP_DOCS ?= "--disable-docs --disable-publican --disable-refdocs"
+
+EXTRA_OECONF += "${STAP_DOCS} "
+
inherit autotools gettext
BBCLASSEXTEND = "native nativesdk"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 0/2] systemtap doc build fix
2012-04-13 19:55 [PATCH 0/2] systemtap doc build fix tom.zanussi
2012-04-13 19:56 ` [PATCH 1/2] systemtap: fix docproc build error tom.zanussi
2012-04-13 19:56 ` [PATCH 2/2] systemtap: disable document generation by default tom.zanussi
@ 2012-04-16 15:40 ` Saul Wold
2 siblings, 0 replies; 5+ messages in thread
From: Saul Wold @ 2012-04-16 15:40 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 04/13/2012 12:55 PM, tom.zanussi@intel.com wrote:
> From: Tom Zanussi<tom.zanussi@intel.com>
>
> This patchset fixes a documentation build problem with docproc, then
> turns documentation generation off by default, since when it works,
> it adds a lot to the build time.
>
> The following changes since commit 04b16f1038f7cae445d741e86c2cc19c70f991c1:
> Andrei Gherzan (1):
> rpm-native: Compile python rpm module (with-python)
>
> are available in the git repository at:
>
> git://git.yoctoproject.org/poky-contrib.git tzanussi/2193-fix
> http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/2193-fix
>
> Tom Zanussi (2):
> systemtap: fix docproc build error
> systemtap: disable document generation by default
>
> .../systemtap/systemtap/docproc-build-fix.patch | 19 +++++++++++++++++++
> meta/recipes-kernel/systemtap/systemtap_git.bb | 10 +++++++++-
> meta/recipes-kernel/systemtap/systemtap_git.inc | 4 +++-
> 3 files changed, 31 insertions(+), 2 deletions(-)
> create mode 100644 meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Merged into OE-Core with additional patch from RP as noted.
Thanks
Sau!
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-04-16 15:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-13 19:55 [PATCH 0/2] systemtap doc build fix tom.zanussi
2012-04-13 19:56 ` [PATCH 1/2] systemtap: fix docproc build error tom.zanussi
2012-04-14 13:39 ` Richard Purdie
2012-04-13 19:56 ` [PATCH 2/2] systemtap: disable document generation by default tom.zanussi
2012-04-16 15:40 ` [PATCH 0/2] systemtap doc build fix Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox