Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 0/2] fix pulseview build failures
@ 2015-04-09 10:19 Bartosz Golaszewski
  2015-04-09 10:19 ` [Buildroot] [PATCH 1/2] doxygen: new package Bartosz Golaszewski
  2015-04-09 10:19 ` [Buildroot] [PATCH 2/2] libsigrok: add host-doxygen dependency for C++ bindings Bartosz Golaszewski
  0 siblings, 2 replies; 5+ messages in thread
From: Bartosz Golaszewski @ 2015-04-09 10:19 UTC (permalink / raw)
  To: buildroot

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.

Bartosz Golaszewski (2):
  doxygen: new package
  libsigrok: add host-doxygen dependency for C++ bindings

 package/doxygen/doxygen.hash   |  2 ++
 package/doxygen/doxygen.mk     | 18 ++++++++++++++++++
 package/libsigrok/libsigrok.mk |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 package/doxygen/doxygen.hash
 create mode 100644 package/doxygen/doxygen.mk

-- 
2.1.4

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 1/2] doxygen: new package
  2015-04-09 10:19 [Buildroot] [PATCH 0/2] fix pulseview build failures Bartosz Golaszewski
@ 2015-04-09 10:19 ` Bartosz Golaszewski
  2015-04-09 19:46   ` Thomas Petazzoni
  2015-04-09 10:19 ` [Buildroot] [PATCH 2/2] libsigrok: add host-doxygen dependency for C++ bindings Bartosz Golaszewski
  1 sibling, 1 reply; 5+ messages in thread
From: Bartosz Golaszewski @ 2015-04-09 10:19 UTC (permalink / raw)
  To: buildroot

Host package only.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
 package/doxygen/doxygen.hash |  2 ++
 package/doxygen/doxygen.mk   | 18 ++++++++++++++++++
 2 files changed, 20 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..b5d3500
--- /dev/null
+++ b/package/doxygen/doxygen.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# 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
+
+# configure fails with default host-autotools-package parameters
+define HOST_DOXYGEN_CONFIGURE_CMDS
+	(cd $(@D); ./configure --shared --prefix=$(HOST_DIR)/usr)
+endef
+
+$(eval $(host-autotools-package))
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 2/2] libsigrok: add host-doxygen dependency for C++ bindings
  2015-04-09 10:19 [Buildroot] [PATCH 0/2] fix pulseview build failures Bartosz Golaszewski
  2015-04-09 10:19 ` [Buildroot] [PATCH 1/2] doxygen: new package Bartosz Golaszewski
@ 2015-04-09 10:19 ` Bartosz Golaszewski
  2015-04-09 19:47   ` Thomas Petazzoni
  1 sibling, 1 reply; 5+ messages in thread
From: Bartosz Golaszewski @ 2015-04-09 10:19 UTC (permalink / raw)
  To: buildroot

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

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 1/2] doxygen: new package
  2015-04-09 10:19 ` [Buildroot] [PATCH 1/2] doxygen: new package Bartosz Golaszewski
@ 2015-04-09 19:46   ` Thomas Petazzoni
  0 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2015-04-09 19:46 UTC (permalink / raw)
  To: buildroot

Dear Bartosz Golaszewski,

On Thu,  9 Apr 2015 12:19:02 +0200, Bartosz Golaszewski wrote:

> +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
> +
> +# configure fails with default host-autotools-package parameters
> +define HOST_DOXYGEN_CONFIGURE_CMDS
> +	(cd $(@D); ./configure --shared --prefix=$(HOST_DIR)/usr)
> +endef
> +
> +$(eval $(host-autotools-package))

configure fails with the default host-autotools-package parameters,
because doxygen does not use the autotools nor even autoconf. So this
package should be handled using the host-generic-package infrastructure
instead.

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 2/2] libsigrok: add host-doxygen dependency for C++ bindings
  2015-04-09 10:19 ` [Buildroot] [PATCH 2/2] libsigrok: add host-doxygen dependency for C++ bindings Bartosz Golaszewski
@ 2015-04-09 19:47   ` Thomas Petazzoni
  0 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2015-04-09 19:47 UTC (permalink / raw)
  To: buildroot

Dear Bartosz Golaszewski,

On Thu,  9 Apr 2015 12:19:03 +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(-)
> 
> 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

Thanks, but please include in your series a revert of
http://git.buildroot.net/buildroot/commit/?id=41e81b7ae149319950814efe3c39acb1200167d2.

Thanks a lot!

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2015-04-09 19:47 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-09 10:19 [Buildroot] [PATCH 0/2] fix pulseview build failures Bartosz Golaszewski
2015-04-09 10:19 ` [Buildroot] [PATCH 1/2] doxygen: new package Bartosz Golaszewski
2015-04-09 19:46   ` Thomas Petazzoni
2015-04-09 10:19 ` [Buildroot] [PATCH 2/2] libsigrok: add host-doxygen dependency for C++ bindings Bartosz Golaszewski
2015-04-09 19:47   ` Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox