package/libsigrok: fix configure options
PATCH 1/3 package/libsigrok: fix configure options
- Remove --disable-glibtest (unrecognized option)
- Switch --{en,dis}able-xxx options by --{with,without}-xxx options
--- package/libsigrok/libsigrok.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
package/libsigrok/libsigrok.mk +7 -7
@@ -10,27 +10,27 @@ LIBSIGROK_LICENSE = GPL-3.0+ LIBSIGROK_LICENSE_FILES = COPYING LIBSIGROK_INSTALL_STAGING = YES LIBSIGROK_DEPENDENCIES = libglib2 libzip host-pkgconf -LIBSIGROK_CONF_OPTS = --disable-glibtest --disable-java --disable-python +LIBSIGROK_CONF_OPTS = --disable-java --disable-python ifeq ($(BR2_PACKAGE_LIBSERIALPORT),y) -LIBSIGROK_CONF_OPTS += --enable-libserialport +LIBSIGROK_CONF_OPTS += --with-libserialport LIBSIGROK_DEPENDENCIES += libserialport else -LIBSIGROK_CONF_OPTS += --disable-libserialport +LIBSIGROK_CONF_OPTS += --without-libserialport endif ifeq ($(BR2_PACKAGE_LIBFTDI),y) -LIBSIGROK_CONF_OPTS += --enable-libftdi +LIBSIGROK_CONF_OPTS += --with-libftdi LIBSIGROK_DEPENDENCIES += libftdi else -LIBSIGROK_CONF_OPTS += --disable-libftdi +LIBSIGROK_CONF_OPTS += --without-libftdi endif ifeq ($(BR2_PACKAGE_LIBUSB),y) -LIBSIGROK_CONF_OPTS += --enable-libusb +LIBSIGROK_CONF_OPTS += --with-libusb LIBSIGROK_DEPENDENCIES += libusb else -LIBSIGROK_CONF_OPTS += --disable-libusb +LIBSIGROK_CONF_OPTS += --without-libusb endif ifeq ($(BR2_PACKAGE_GLIBMM),y)
Signature · 1 line
2.23.0
PATCH 2/3 package/libsigrok: fix C++ build with doxygen 1.8.16
Fixes:
- http://autobuild.buildroot.net/results/f1d0868e99402954dc96773c5ace192525deeab8
--- ...ompilation-with-newer-Doxygen-1-8-16.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/libsigrok/0001-build-unbreak-C++-binding-compilation-with-newer-Doxygen-1-8-16.patch
package/libsigrok/0001-build-unbreak-C++-binding-compilation-with-newer-Doxygen-1-8-16.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 2da97803e653b814db3a42b3b749953368932cb6 Mon Sep 17 00:00:00 2001 +From: Gerhard Sittig <[email protected]> +Date: Sun, 6 Oct 2019 10:08:09 +0200 +Subject: [PATCH] build: unbreak C++ binding compilation with newer Doxygen + (1.8.16) + +Doxygen version 1.8.16 introduced an issue which breaks the compilation +of sigrok's C++ binding (https://github.com/doxygen/doxygen/issues/7190). +Don't set the FILE_PATTERNS variable at all, instead of assigning an +empty value. This resolves bug #1422. + +[Retrieved from: +https://github.com/sigrokproject/libsigrok/commit/2da97803e653b814db3a42b3b749953368932cb6] +Signed-off-by: Fabrice Fontaine <[email protected]> +--- + Doxyfile | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Doxyfile b/Doxyfile +index 252e504e..76f410a0 100644 +--- a/Doxyfile ++++ b/Doxyfile +@@ -763,7 +763,11 @@ INPUT_ENCODING = UTF-8 + # *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, + # *.qsf, *.as and *.js. + +-FILE_PATTERNS = ++# BEWARE! DON'T set the variable to an empty value. Don't set the variable ++# at all instead. See https://github.com/doxygen/doxygen/issues/7190 and ++# https://sigrok.org/bugzilla/show_bug.cgi?id=1422 (can get reverted when ++# the Doxygen version which causes the issue no longer is used in the wild). ++## FILE_PATTERNS = + + # The RECURSIVE tag can be used to specify whether or not subdirectories should + # be searched for input files as well.
Signature · 1 line
2.23.0
PATCH 3/3 package/libsigrok: add hash for license file
In reply to Fabrice Fontaine--- package/libsigrok/libsigrok.hash | 1 + 1 file changed, 1 insertion(+)
package/libsigrok/libsigrok.hash +1 -0
@@ -1,2 +1,3 @@ # Locally computed sha256 e40fde7af98d29e922e9d3cbe0a6c0569889153fc31e47b8b1afe4d846292b9c libsigrok-0.5.1.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
Signature · 1 line
2.23.0
PATCH 3/3 package/libsigrok: add hash for license file
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2019.02.x and 2019.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/3 package/libsigrok: fix configure options
In reply to Fabrice FontaineQuoted 7 lines · On Sun, 27 Oct 2019 18:49:47 +0100 Fabrice Fontaine…
- Remove --disable-glibtest (unrecognized option)
- Switch --{en,dis}able-xxx options by --{with,without}-xxx optionsSigned-off-by Fabrice Fontaine <[email protected]>--- package/libsigrok/libsigrok.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
Series applied. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/3 package/libsigrok: fix configure options
In reply to Fabrice FontaineQuoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
- Remove --disable-glibtest (unrecognized option)
- Switch --{en,dis}able-xxx options by --{with,without}-xxx optionsSigned-off-by Fabrice Fontaine <[email protected]>
Committed to 2019.02.x and 2019.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard