* [Buildroot] [PATCH 2/8] package/bitcoin: give a default value for BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS
2019-12-08 16:27 [Buildroot] [PATCH 1/8] package/bitcoin: depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 Fabrice Fontaine
@ 2019-12-08 16:27 ` Fabrice Fontaine
2019-12-08 16:27 ` [Buildroot] [PATCH 3/8] package/bitcoin: needs wchar Fabrice Fontaine
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2019-12-08 16:27 UTC (permalink / raw)
To: buildroot
bitcoin can never be enabled because BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS
is never set as it has no default value
Fixes:
- No autobuilder failure
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/bitcoin/Config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/bitcoin/Config.in b/package/bitcoin/Config.in
index c6788d5f98..78b248890b 100644
--- a/package/bitcoin/Config.in
+++ b/package/bitcoin/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS
bool
- depends on BR2_TOOLCHAIN_HAS_ATOMIC
+ default y if BR2_TOOLCHAIN_HAS_ATOMIC
# bitcoin uses 8-byte __atomic intrinsics, which are not
# available on ARM noMMU platforms that we
# support. BR2_TOOLCHAIN_HAS_ATOMIC does not provide a
--
2.24.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 3/8] package/bitcoin: needs wchar
2019-12-08 16:27 [Buildroot] [PATCH 1/8] package/bitcoin: depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 Fabrice Fontaine
2019-12-08 16:27 ` [Buildroot] [PATCH 2/8] package/bitcoin: give a default value for BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS Fabrice Fontaine
@ 2019-12-08 16:27 ` Fabrice Fontaine
2019-12-08 16:27 ` [Buildroot] [PATCH 4/8] package/bitcoin: add host-pkgconf dependency Fabrice Fontaine
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2019-12-08 16:27 UTC (permalink / raw)
To: buildroot
wchar is used in src/tinyformat.h and is a reverse dependency of boost
Fixes:
- No autobuilder failure (as package can't be enabled yet)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/bitcoin/Config.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/bitcoin/Config.in b/package/bitcoin/Config.in
index 78b248890b..3936cd3c79 100644
--- a/package/bitcoin/Config.in
+++ b/package/bitcoin/Config.in
@@ -12,6 +12,7 @@ config BR2_PACKAGE_BITCOIN
depends on BR2_INSTALL_LIBSTDCPP
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future
depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS
+ depends on BR2_USE_WCHAR
select BR2_PACKAGE_BOOST
select BR2_PACKAGE_BOOST_SYSTEM
select BR2_PACKAGE_BOOST_FILESYSTEM
@@ -36,9 +37,9 @@ config BR2_PACKAGE_BITCOIN
https://bitcoincore.org
-comment "bitcoin needs a toolchain w/ C++"
+comment "bitcoin needs a toolchain w/ C++, wchar"
depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
comment "bitcoin needs a toolchain not affected by GCC bug 64735"
depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS
--
2.24.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 4/8] package/bitcoin: add host-pkgconf dependency
2019-12-08 16:27 [Buildroot] [PATCH 1/8] package/bitcoin: depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 Fabrice Fontaine
2019-12-08 16:27 ` [Buildroot] [PATCH 2/8] package/bitcoin: give a default value for BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS Fabrice Fontaine
2019-12-08 16:27 ` [Buildroot] [PATCH 3/8] package/bitcoin: needs wchar Fabrice Fontaine
@ 2019-12-08 16:27 ` Fabrice Fontaine
2019-12-08 16:27 ` [Buildroot] [PATCH 5/8] package/bitcoin: disable benchmarks Fabrice Fontaine
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2019-12-08 16:27 UTC (permalink / raw)
To: buildroot
pkg-config can used to retrieve openssl and libevent dependencies
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/bitcoin/bitcoin.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/bitcoin/bitcoin.mk b/package/bitcoin/bitcoin.mk
index eefde1df96..7335c10187 100644
--- a/package/bitcoin/bitcoin.mk
+++ b/package/bitcoin/bitcoin.mk
@@ -9,7 +9,7 @@ BITCOIN_SITE = $(call github,bitcoin,bitcoin,v$(BITCOIN_VERSION))
BITCOIN_AUTORECONF = YES
BITCOIN_LICENSE = MIT
BITCOIN_LICENSE_FILES = COPYING
-BITCOIN_DEPENDENCIES = boost openssl libevent
+BITCOIN_DEPENDENCIES = host-pkgconf boost openssl libevent
BITCOIN_CONF_OPTS = \
--disable-wallet \
--disable-tests \
--
2.24.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 5/8] package/bitcoin: disable benchmarks
2019-12-08 16:27 [Buildroot] [PATCH 1/8] package/bitcoin: depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 Fabrice Fontaine
` (2 preceding siblings ...)
2019-12-08 16:27 ` [Buildroot] [PATCH 4/8] package/bitcoin: add host-pkgconf dependency Fabrice Fontaine
@ 2019-12-08 16:27 ` Fabrice Fontaine
2019-12-08 16:27 ` [Buildroot] [PATCH 6/8] package/bitcoin: add optional libminiupnpc dependency Fabrice Fontaine
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2019-12-08 16:27 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/bitcoin/bitcoin.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/bitcoin/bitcoin.mk b/package/bitcoin/bitcoin.mk
index 7335c10187..7373bf4106 100644
--- a/package/bitcoin/bitcoin.mk
+++ b/package/bitcoin/bitcoin.mk
@@ -11,6 +11,7 @@ BITCOIN_LICENSE = MIT
BITCOIN_LICENSE_FILES = COPYING
BITCOIN_DEPENDENCIES = host-pkgconf boost openssl libevent
BITCOIN_CONF_OPTS = \
+ --disable-bench \
--disable-wallet \
--disable-tests \
--with-boost-libdir=$(STAGING_DIR)/usr/lib/ \
--
2.24.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 6/8] package/bitcoin: add optional libminiupnpc dependency
2019-12-08 16:27 [Buildroot] [PATCH 1/8] package/bitcoin: depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 Fabrice Fontaine
` (3 preceding siblings ...)
2019-12-08 16:27 ` [Buildroot] [PATCH 5/8] package/bitcoin: disable benchmarks Fabrice Fontaine
@ 2019-12-08 16:27 ` Fabrice Fontaine
2019-12-08 16:27 ` [Buildroot] [PATCH 7/8] package/bitcoin: disable gui Fabrice Fontaine
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2019-12-08 16:27 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/bitcoin/bitcoin.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/bitcoin/bitcoin.mk b/package/bitcoin/bitcoin.mk
index 7373bf4106..c01cacb0df 100644
--- a/package/bitcoin/bitcoin.mk
+++ b/package/bitcoin/bitcoin.mk
@@ -17,4 +17,11 @@ BITCOIN_CONF_OPTS = \
--with-boost-libdir=$(STAGING_DIR)/usr/lib/ \
--disable-hardening
+ifeq ($(BR2_PACKAGE_LIBMINIUPNPC),y)
+BITCOIN_DEPENDENCIES += libminiupnpc
+BITCOIN_CONF_OPTS += --with-miniupnpc
+else
+BITCOIN_CONF_OPTS += --without-miniupnpc
+endif
+
$(eval $(autotools-package))
--
2.24.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 7/8] package/bitcoin: disable gui
2019-12-08 16:27 [Buildroot] [PATCH 1/8] package/bitcoin: depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 Fabrice Fontaine
` (4 preceding siblings ...)
2019-12-08 16:27 ` [Buildroot] [PATCH 6/8] package/bitcoin: add optional libminiupnpc dependency Fabrice Fontaine
@ 2019-12-08 16:27 ` Fabrice Fontaine
2019-12-08 16:27 ` [Buildroot] [PATCH 8/8] package/bitcoin: add optional zeromq dependency Fabrice Fontaine
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2019-12-08 16:27 UTC (permalink / raw)
To: buildroot
Currently gui is autodetected so disable it for now
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/bitcoin/bitcoin.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/package/bitcoin/bitcoin.mk b/package/bitcoin/bitcoin.mk
index c01cacb0df..db9e9ab90c 100644
--- a/package/bitcoin/bitcoin.mk
+++ b/package/bitcoin/bitcoin.mk
@@ -15,7 +15,8 @@ BITCOIN_CONF_OPTS = \
--disable-wallet \
--disable-tests \
--with-boost-libdir=$(STAGING_DIR)/usr/lib/ \
- --disable-hardening
+ --disable-hardening \
+ --without-gui
ifeq ($(BR2_PACKAGE_LIBMINIUPNPC),y)
BITCOIN_DEPENDENCIES += libminiupnpc
--
2.24.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 8/8] package/bitcoin: add optional zeromq dependency
2019-12-08 16:27 [Buildroot] [PATCH 1/8] package/bitcoin: depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 Fabrice Fontaine
` (5 preceding siblings ...)
2019-12-08 16:27 ` [Buildroot] [PATCH 7/8] package/bitcoin: disable gui Fabrice Fontaine
@ 2019-12-08 16:27 ` Fabrice Fontaine
2019-12-08 21:50 ` [Buildroot] [PATCH 1/8] package/bitcoin: depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 Thomas Petazzoni
2019-12-22 20:23 ` Peter Korsgaard
8 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2019-12-08 16:27 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/bitcoin/bitcoin.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/bitcoin/bitcoin.mk b/package/bitcoin/bitcoin.mk
index db9e9ab90c..a3ac45e104 100644
--- a/package/bitcoin/bitcoin.mk
+++ b/package/bitcoin/bitcoin.mk
@@ -25,4 +25,11 @@ else
BITCOIN_CONF_OPTS += --without-miniupnpc
endif
+ifeq ($(BR2_PACKAGE_ZEROMQ),y)
+BITCOIN_DEPENDENCIES += zeromq
+BITCOIN_CONF_OPTS += --with-zmq
+else
+BITCOIN_CONF_OPTS += --without-zmq
+endif
+
$(eval $(autotools-package))
--
2.24.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 1/8] package/bitcoin: depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735
2019-12-08 16:27 [Buildroot] [PATCH 1/8] package/bitcoin: depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 Fabrice Fontaine
` (6 preceding siblings ...)
2019-12-08 16:27 ` [Buildroot] [PATCH 8/8] package/bitcoin: add optional zeromq dependency Fabrice Fontaine
@ 2019-12-08 21:50 ` Thomas Petazzoni
2019-12-22 20:23 ` Peter Korsgaard
8 siblings, 0 replies; 10+ messages in thread
From: Thomas Petazzoni @ 2019-12-08 21:50 UTC (permalink / raw)
To: buildroot
On Sun, 8 Dec 2019 17:27:18 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> Obviously, bitcoin depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735, not on
> BR2_TOOLCHAIN_HAS_GCC_BUG_64735
>
> Fixes:
> - No autobuilder failure
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/bitcoin/Config.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Wow, this is really bad :-/ And it's something that I changed when
applying the original patch, so it's entirely my fault :-/
Thanks for noticing and fixing it. I've applied your entire series.
Thanks a lot.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 1/8] package/bitcoin: depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735
2019-12-08 16:27 [Buildroot] [PATCH 1/8] package/bitcoin: depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 Fabrice Fontaine
` (7 preceding siblings ...)
2019-12-08 21:50 ` [Buildroot] [PATCH 1/8] package/bitcoin: depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 Thomas Petazzoni
@ 2019-12-22 20:23 ` Peter Korsgaard
8 siblings, 0 replies; 10+ messages in thread
From: Peter Korsgaard @ 2019-12-22 20:23 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Obviously, bitcoin depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735, not on
> BR2_TOOLCHAIN_HAS_GCC_BUG_64735
> Fixes:
> - No autobuilder failure
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed all 8 to 2019.11.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 10+ messages in thread