systemtap doc build fix

PATCH Applied [email protected] 3 participants 5 messages Apr 13, 2012 – Apr 16, 2012

lore

Share & tools

lore

[email protected]

author

2012-04-13 20:05 UTC #0 lore raw

cover systemtap doc build fix

From: Tom Zanussi <[email protected]>

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

[email protected]

author

2012-04-13 20:05 UTC #1 lore raw

PATCH 1/2 systemtap: fix docproc build error

From: Tom Zanussi <[email protected]>

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 <[email protected]>

---
 .../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

meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch new file +19 -0

new file mode 100644
index 0000000..33a8994
@@ -0,0 +1,19 @@
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Tom Zanussi <[email protected]>
+
+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')

meta/recipes-kernel/systemtap/systemtap_git.bb +5 -1

index c4a9d87..1d2c9f3 100644
@@ -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 \

meta/recipes-kernel/systemtap/systemtap_git.inc +3 -1

index cc250ff..c4d6e34 100644
@@ -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"

Signature · 1 line

1.7.0.4

[email protected]

author

2012-04-13 20:06 UTC #2 lore raw

PATCH 2/2 systemtap: disable document generation by default

From: Tom Zanussi <[email protected]>

Building the systemtap documentation adds significantly to the build time, so disable it by default.

Signed-off-by Tom Zanussi <[email protected]>

---
 meta/recipes-kernel/systemtap/systemtap_git.bb |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

meta/recipes-kernel/systemtap/systemtap_git.bb +4 -0

index 1d2c9f3..91bccd1 100644
@@ -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"

Signature · 1 line

1.7.0.4

Richard Purdie

2012-04-14 13:49 UTC #3 lore raw

Re: [PATCH 1/2] systemtap: fix docproc build error

In reply to [email protected]

Quoted 8 lines · On Fri, 2012-04-13 at 14:56 -0500, [email protected] wrote:

From: Tom Zanussi <[email protected]>
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].

Quoted 7 lines

Signed-off-by Tom Zanussi <[email protected]>

---
 .../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

This broke systemtap-uprobes. I've pushed a fix:

http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=45da10943965193fd2d14b756b95e6f0f4ae9029

Cheers,

Richard

Saul Wold

Applied

2012-04-16 15:50 UTC #4 lore raw

In reply to [email protected]

Quoted 23 lines · On 04/13/2012 12:55 PM, [email protected] wrote:

From: Tom Zanussi<[email protected]>
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(-)

Quoted 8 lines

create mode 100644 meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Merged into OE-Core with additional patch from RP as noted.

Thanks
Sau!