Skip to contentSkip to conversation

vala: fix documentation build problem

PATCH Superseded Thomas Petazzoni 2 participants 3 messages Sep 17, 2012 – Sep 19, 2012

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Thomas Petazzoni

author
#0 lore raw

PATCH 1/1 vala: fix documentation build problem

On gcc10, the build of the host-vala documentation causes a segmentation fault of xsltproc, for some unknown reason. See:

http://autobuild.buildroot.org/results/42fea25ac4fe33a56c02d90c361da1c494f79ba3/build-end.log

Therefore, this patch fixes the problem by:

* Ensuring that host-libxslt is amongst the dependency of vala (vala for the target) so that we build a well-known version of libxslt/xsltproc.

* Disabling the build of the documentation for host-vala. Note that we need to pass ':' as the xsltproc binary name to teach the configure script that xsltproc is not available.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/vala/vala.mk |    8 ++++++++
 1 file changed, 8 insertions(+)
package/vala/vala.mk +8 -0
index 984043c..83c45b0 100644
@@ -9,9 +9,17 @@ VALA_VERSION_MINOR = 6
 VALA_VERSION = $(VALA_VERSION_MAJOR).$(VALA_VERSION_MINOR)
 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR)
 VALA_SOURCE = vala-$(VALA_VERSION).tar.xz
+
 VALA_DEPENDENCIES = host-flex libglib2 \
 		$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+ifeq ($(BR2_HAVE_DOCUMENTATION),y)
+VALA_DEPENDENCIES += host-libxslt
+endif
+
 HOST_VALA_DEPENDENCIES = host-flex host-libglib2
+# Yes, the autoconf script understands ':' as "xsltproc is not
+# available".
+HOST_VALA_CONF_ENV = ac_cv_path_XSLTPROC=:
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 vala: fix documentation build problem

Quoted 25 lines · Thomas Petazzoni

On gcc10, the build of the host-vala documentation causes a segmentation fault of xsltproc, for some unknown reason. See:

   http://autobuild.buildroot.org/results/42fea25ac4fe33a56c02d90c361da1c494f79ba3/build-end.log

Therefore, this patch fixes the problem by:

* Ensuring that host-libxslt is amongst the dependency of vala (vala for the target) so that we build a well-known version of libxslt/xsltproc.

* Disabling the build of the documentation for host-vala. Note that we need to pass ':' as the xsltproc binary name to teach the configure script that xsltproc is not available.

Signed-off-by Thomas Petazzoni<[email protected]>
---
  package/vala/vala.mk |    8 ++++++++
  1 file changed, 8 insertions(+)
package/vala/vala.mk +0 -0
index 984043c..83c45b0 100644

package/vala/vala.mk VALA_VERSION_MINOR = 6 · line 16

Quoted 8 lines
package/vala/vala.mk +3 -0
@@ -9,9 +9,17 @@ VALA_VERSION_MINOR = 6
  VALA_VERSION = $(VALA_VERSION_MAJOR).$(VALA_VERSION_MINOR)
  VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR)
  VALA_SOURCE = vala-$(VALA_VERSION).tar.xz
+
  VALA_DEPENDENCIES = host-flex libglib2 \
  		$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+ifeq ($(BR2_HAVE_DOCUMENTATION),y)
+VALA_DEPENDENCIES += host-libxslt

Don't you need ac_cv_path_XSLTPROC=: in the else case too?

Regards,
Arnout

Quoted 9 lines
package/vala/vala.mk +5 -0
+endif
+
  HOST_VALA_DEPENDENCIES = host-flex host-libglib2
+# Yes, the autoconf script understands ':' as "xsltproc is not
+# available".
+HOST_VALA_CONF_ENV = ac_cv_path_XSLTPROC=:
 
  $(eval $(autotools-package))
  $(eval $(host-autotools-package))
Signature · 6 lines
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
author
#2 lore raw

PATCH 1/1 vala: fix documentation build problem

Dear Arnout Vandecappelle,

Quoted 4 lines · Arnout Vandecappelle

package/vala/vala.mk VALA_VERSION_MINOR = 6 · line 16

Quoted 2 lines
package/vala/vala.mk +2 -0
+ifeq ($(BR2_HAVE_DOCUMENTATION),y)
+VALA_DEPENDENCIES += host-libxslt

Don't you need ac_cv_path_XSLTPROC=: in the else case too?

Yes that's what PATCHv2 did.

Thanks for the review!

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com