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

[Buildroot] [PATCH v2 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.

v2:
- use host-generic-package instead of host-autotools-package
- revert commit 41e81b7

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     | 25 +++++++++++++++++++++++++
 package/libsigrok/Config.in    |  3 ---
 package/libsigrok/libsigrok.mk |  2 +-
 package/pulseview/Config.in    |  2 --
 5 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 package/doxygen/doxygen.hash
 create mode 100644 package/doxygen/doxygen.mk

-- 
2.1.4

[Buildroot] [PATCH v2 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   | 25 +++++++++++++++++++++++++
 2 files changed, 27 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..40884d4
--- /dev/null
+++ b/package/doxygen/doxygen.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
+# 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 DOXYGEN_BUILD_CMDS
+	($(MAKE) -C $(@D))
+endef
+
+define HOST_DOXYGEN_INSTALL_CMDS
+	($(MAKE) install -C $(@D))
+endef
+
+$(eval $(host-autotools-package))
-- 
2.1.4

[Buildroot] [PATCH v2 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 v2 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 v2 1/3] doxygen: new package

[Bartosz Golaszewski]

2015-04-10 10:16 GMT+02:00 Bartosz Golaszewski <bgolaszewski@baylibre.com>:
> Host package only.
>
> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
> ---
>  package/doxygen/doxygen.hash |  2 ++
>  package/doxygen/doxygen.mk   | 25 +++++++++++++++++++++++++
>  2 files changed, 27 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..40884d4
> --- /dev/null
> +++ b/package/doxygen/doxygen.mk
> @@ -0,0 +1,25 @@
> +################################################################################
> +#
> +# 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 DOXYGEN_BUILD_CMDS
> +       ($(MAKE) -C $(@D))
> +endef
> +
> +define HOST_DOXYGEN_INSTALL_CMDS
> +       ($(MAKE) install -C $(@D))
> +endef
> +
> +$(eval $(host-autotools-package))
> --
> 2.1.4
>

Sorry, for that - I eventually forgot to change host-autotools-package
to host-generic-package. Surprisingly it works.

Version 3 coming right up.

Best regards,
Bartosz Golaszewski

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

[Thomas Petazzoni]

Dear Bartosz Golaszewski,

On Fri, 10 Apr 2015 11:20:52 +0200, Bartosz Golaszewski wrote:

> Sorry, for that - I eventually forgot to change host-autotools-package
> to host-generic-package. Surprisingly it works.

This is not surprising: host-autotools-package allows you to override
<pkg>_CONFIGURE_CMDS, <pkg>_BUILD_CMDS and <pkg>_INSTALL_*_CMDS.

Also, in your v3, remove the parenthesis:

	($(MAKE) -C $(@D))

should be just:

	$(MAKE) -C $(@D)

And add a comment in the .mk file to explain why we're not using
host-autotools-package even if there is a ./configure script being
called.

Thanks!

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