[Buildroot] [PATCH v3 0/3] fix pulseview build failures

[Buildroot] [PATCH v3 0/3] fix pulseview build failures

[Bartosz Golaszewski]

This series fixes pulseview build failures which have been observed
on many autobuilders. They have been caused by doxygen not being present
on host machines.

The first patch adds doxygen host package. The second makes libsigrok
depend on it when C++ bindings are selected. When that is fixed we
can finally revert the patch marking libsigrokcxx as broken.

v3:
- *really* use host-generic-package instead of host-autotools-package
- drop unneeded parenthesis around make invocations
- add a comment about the reason for not using host-autotools-package

v2:
http://lists.busybox.net/pipermail/buildroot/2015-April/124811.html

v1:
http://lists.busybox.net/pipermail/buildroot/2015-April/124714.html

Bartosz Golaszewski (3):
  doxygen: new package
  libsigrok: add host-doxygen dependency for C++ bindings
  Revert "libsigrok: mark libsigrokcxx as broken"

 package/doxygen/doxygen.hash   |  2 ++
 package/doxygen/doxygen.mk     | 28 ++++++++++++++++++++++++++++
 package/libsigrok/Config.in    |  3 ---
 package/libsigrok/libsigrok.mk |  2 +-
 package/pulseview/Config.in    |  2 --
 5 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 package/doxygen/doxygen.hash
 create mode 100644 package/doxygen/doxygen.mk

-- 
2.1.4

[Buildroot] [PATCH v3 1/3] doxygen: new package

[Bartosz Golaszewski]

Host package only.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
 package/doxygen/doxygen.hash |  2 ++
 package/doxygen/doxygen.mk   | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 package/doxygen/doxygen.hash
 create mode 100644 package/doxygen/doxygen.mk

diff --git a/package/doxygen/doxygen.hash b/package/doxygen/doxygen.hash
new file mode 100644
index 0000000..40cfe16
--- /dev/null
+++ b/package/doxygen/doxygen.hash
@@ -0,0 +1,2 @@
+# Computed locally
+sha256 d4ab6e28d4d45d8956cad17470aade3fbe2356e8f64b92167e738c1887feccec  doxygen-1.8.9.1.src.tar.gz
diff --git a/package/doxygen/doxygen.mk b/package/doxygen/doxygen.mk
new file mode 100644
index 0000000..07fba54
--- /dev/null
+++ b/package/doxygen/doxygen.mk
@@ -0,0 +1,28 @@
+################################################################################
+#
+# doxygen
+#
+################################################################################
+
+DOXYGEN_VERSION = 1.8.9.1
+DOXYGEN_SOURCE = doxygen-$(DOXYGEN_VERSION).src.tar.gz
+DOXYGEN_SITE = http://ftp.stack.nl/pub/users/dimitri/
+DOXYGEN_LICENSE = GPLv2
+DOXYGEN_LICENSE_FILES = LICENSE
+
+define HOST_DOXYGEN_CONFIGURE_CMDS
+	(cd $(@D); ./configure --shared --prefix=$(HOST_DIR)/usr)
+endef
+
+define HOST_DOXYGEN_BUILD_CMDS
+	$(MAKE) -C $(@D)
+endef
+
+define HOST_DOXYGEN_INSTALL_CMDS
+	$(MAKE) install -C $(@D)
+endef
+
+# Doxygen's configure is a handwritten script, not an autotools-generated one.
+# It doesn't accept host-autotools-package default arguments, so we have to
+# call host-generic-package here.
+$(eval $(host-generic-package))
-- 
2.1.4

[Buildroot] [PATCH v3 1/3] doxygen: new package

[Thomas Petazzoni]

Dear Bartosz Golaszewski,

On Fri, 10 Apr 2015 11:49:57 +0200, Bartosz Golaszewski wrote:
> Host package only.
> 
> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
> ---
>  package/doxygen/doxygen.hash |  2 ++
>  package/doxygen/doxygen.mk   | 28 ++++++++++++++++++++++++++++
>  2 files changed, 30 insertions(+)
>  create mode 100644 package/doxygen/doxygen.hash
>  create mode 100644 package/doxygen/doxygen.mk

I've applied, but I had to do some further changes, because it was
still not building properly:

    [Thomas:
     - add missing dependencies on host-flex and host-bison
     - add $(HOST_MAKE_ENV) to the configure, build and install steps, to
       make sure that the doxygen build system can find flex and bison.]

You don't catch such issues because you build on a development system
that has lots of development tools already installed, while the
autobuilders are testing using minimal chroots having only the strictly
required Buildroot dependencies installed.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH v3 1/3] doxygen: new package

[Bartosz Golaszewski]

2015-04-12 18:55 GMT+02:00 Thomas Petazzoni
<thomas.petazzoni@free-electrons.com>:
> Dear Bartosz Golaszewski,
>
> On Fri, 10 Apr 2015 11:49:57 +0200, Bartosz Golaszewski wrote:
>> Host package only.
>>
>> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
>> ---
>>  package/doxygen/doxygen.hash |  2 ++
>>  package/doxygen/doxygen.mk   | 28 ++++++++++++++++++++++++++++
>>  2 files changed, 30 insertions(+)
>>  create mode 100644 package/doxygen/doxygen.hash
>>  create mode 100644 package/doxygen/doxygen.mk
>
> I've applied, but I had to do some further changes, because it was
> still not building properly:
>
>     [Thomas:
>      - add missing dependencies on host-flex and host-bison
>      - add $(HOST_MAKE_ENV) to the configure, build and install steps, to
>        make sure that the doxygen build system can find flex and bison.]
>
> You don't catch such issues because you build on a development system
> that has lots of development tools already installed, while the
> autobuilders are testing using minimal chroots having only the strictly
> required Buildroot dependencies installed.

I'll have to start testing buildroot patches in a minimal chrooted
environment then. Thanks for the hint.

Best regards,
Bartosz Golaszewski

[Buildroot] [PATCH v3 1/3] doxygen: new package

[Thomas Petazzoni]

Dear Bartosz Golaszewski,

On Mon, 13 Apr 2015 12:31:16 +0200, Bartosz Golaszewski wrote:

> > You don't catch such issues because you build on a development system
> > that has lots of development tools already installed, while the
> > autobuilders are testing using minimal chroots having only the strictly
> > required Buildroot dependencies installed.
> 
> I'll have to start testing buildroot patches in a minimal chrooted
> environment then. Thanks for the hint.

Well, it's not strictly mandatory. Usually, it doesn't make such a big
difference, and the minor missing dependencies are found using the
autobuilders. You just had some bad luck with this unexpected doxygen
dependency, with doxygen itself depending on flex and bison, plus
libsigrok depending on python to generated the C++ bindings. This is
rather unusual, so I can't blame you for not having tested things
inside a minimal chroot: our autobuilders are also here to allow us to
save a bit of time when developing the packages, knowing that the
autobuilders will validate a number of things once the packages get
committed.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH v3 2/3] libsigrok: add host-doxygen dependency for C++ bindings

[Bartosz Golaszewski]

Doxygen is required to generate xml files required by libsigrokcxx
build system.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
 package/libsigrok/libsigrok.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libsigrok/libsigrok.mk b/package/libsigrok/libsigrok.mk
index 1e6080d..4309480 100644
--- a/package/libsigrok/libsigrok.mk
+++ b/package/libsigrok/libsigrok.mk
@@ -48,7 +48,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBSIGROKCXX),y)
 LIBSIGROK_CONF_OPTS += --enable-cxx
-LIBSIGROK_DEPENDENCIES += host-autoconf-archive glibmm
+LIBSIGROK_DEPENDENCIES += host-autoconf-archive glibmm host-doxygen
 else
 LIBSIGROK_CONF_OPTS += --disable-cxx
 endif
-- 
2.1.4

[Buildroot] [PATCH v3 2/3] libsigrok: add host-doxygen dependency for C++ bindings

[Thomas Petazzoni]

Dear Bartosz Golaszewski,

On Fri, 10 Apr 2015 11:49:58 +0200, Bartosz Golaszewski wrote:
> Doxygen is required to generate xml files required by libsigrokcxx
> build system.
> 
> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
> ---
>  package/libsigrok/libsigrok.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

I've applied, after adding host-python (or host-python3) in the
dependencies when building the C++ bindings. Otherwise, the creation of
the C++ bindings fail, due to Python being too old: some autobuilders
only have Python 2.6, while libsigrok requires at least Python 2.7.

Committed with this fixed.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH v3 3/3] Revert "libsigrok: mark libsigrokcxx as broken"

[Bartosz Golaszewski]

This reverts commit 41e81b7ae149319950814efe3c39acb1200167d2.

Doxygen dependency issue for libsigrokcxx has been fixed.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
 package/libsigrok/Config.in | 3 ---
 package/pulseview/Config.in | 2 --
 2 files changed, 5 deletions(-)

diff --git a/package/libsigrok/Config.in b/package/libsigrok/Config.in
index bd37319..93bd06f 100644
--- a/package/libsigrok/Config.in
+++ b/package/libsigrok/Config.in
@@ -22,15 +22,12 @@ config BR2_PACKAGE_LIBSIGROKCXX
 	bool "build C++ bindings"
 	select BR2_PACKAGE_GLIBMM
 	depends on BR2_INSTALL_LIBSTDCPP
-	# requires doxygen, which isn't packaged in Buildroot
-	depends on BROKEN
 	help
 	  Build libsigrok C++ bindings as well.
 
 comment "C++ bindings need a toolchain w/ C++"
 	depends on BR2_PACKAGE_LIBSIGROK
 	depends on !BR2_INSTALL_LIBSTDCPP
-	depends on BROKEN
 
 endif
 
diff --git a/package/pulseview/Config.in b/package/pulseview/Config.in
index e0f1bcf..de899af 100644
--- a/package/pulseview/Config.in
+++ b/package/pulseview/Config.in
@@ -15,7 +15,6 @@ config BR2_PACKAGE_PULSEVIEW
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BROKEN # libsigrokcxx
 	help
 	  PulseView is a Qt based logic analyzer, oscilloscope
 	  and MSO GUI for sigrok.
@@ -26,4 +25,3 @@ comment "pulseview needs a toolchain w/ wchar, threads, C++"
 	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_QT5
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
-	depends on BROKEN # libsigrokcxx
-- 
2.1.4

[Buildroot] [PATCH v3 3/3] Revert "libsigrok: mark libsigrokcxx as broken"

[Thomas Petazzoni]

Dear Bartosz Golaszewski,

On Fri, 10 Apr 2015 11:49:59 +0200, Bartosz Golaszewski wrote:
> This reverts commit 41e81b7ae149319950814efe3c39acb1200167d2.
> 
> Doxygen dependency issue for libsigrokcxx has been fixed.
> 
> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
> ---
>  package/libsigrok/Config.in | 3 ---
>  package/pulseview/Config.in | 2 --
>  2 files changed, 5 deletions(-)

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com