Skip to contentSkip to conversation

package/bitcoin: depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735

PATCH New Fabrice Fontaine 3 participants 10 messages Dec 8, 2019 – Dec 22, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/8 package/bitcoin: depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735

Obviously, bitcoin depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735, not on BR2_TOOLCHAIN_HAS_GCC_BUG_64735

Fixes:
- No autobuilder failure

---
 package/bitcoin/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/bitcoin/Config.in +1 -1
index 03e040d8f5..c6788d5f98 100644
@@ -10,7 +10,7 @@ config BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS
 config BR2_PACKAGE_BITCOIN
 	bool "bitcoin"
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future
+	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future
 	depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS
 	select BR2_PACKAGE_BOOST
 	select BR2_PACKAGE_BOOST_SYSTEM
Signature · 1 line
2.24.0
#1 lore raw

PATCH 2/8 package/bitcoin: give a default value for BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS

bitcoin can never be enabled because BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS is never set as it has no default value

Fixes:
- No autobuilder failure

---
 package/bitcoin/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/bitcoin/Config.in +1 -1
index c6788d5f98..78b248890b 100644
@@ -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
Signature · 1 line
2.24.0
#2 lore raw

PATCH 3/8 package/bitcoin: needs wchar

In reply to Fabrice Fontaine

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)

---
 package/bitcoin/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
package/bitcoin/Config.in +3 -2
index 78b248890b..3936cd3c79 100644
@@ -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
Signature · 1 line
2.24.0
#3 lore raw

PATCH 4/8 package/bitcoin: add host-pkgconf dependency

In reply to Fabrice Fontaine

pkg-config can used to retrieve openssl and libevent dependencies

---
 package/bitcoin/bitcoin.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/bitcoin/bitcoin.mk +1 -1
index eefde1df96..7335c10187 100644
@@ -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 \
Signature · 1 line
2.24.0
#4 lore raw

PATCH 5/8 package/bitcoin: disable benchmarks

In reply to Fabrice Fontaine
---
 package/bitcoin/bitcoin.mk | 1 +
 1 file changed, 1 insertion(+)
package/bitcoin/bitcoin.mk +1 -0
index 7335c10187..7373bf4106 100644
@@ -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/ \
Signature · 1 line
2.24.0
#5 lore raw

PATCH 6/8 package/bitcoin: add optional libminiupnpc dependency

In reply to Fabrice Fontaine
---
 package/bitcoin/bitcoin.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/bitcoin/bitcoin.mk +7 -0
index 7373bf4106..c01cacb0df 100644
@@ -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))
Signature · 1 line
2.24.0
#6 lore raw

PATCH 7/8 package/bitcoin: disable gui

In reply to Fabrice Fontaine

Currently gui is autodetected so disable it for now

---
 package/bitcoin/bitcoin.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/bitcoin/bitcoin.mk +2 -1
index c01cacb0df..db9e9ab90c 100644
@@ -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
Signature · 1 line
2.24.0
#7 lore raw

PATCH 8/8 package/bitcoin: add optional zeromq dependency

In reply to Fabrice Fontaine
---
 package/bitcoin/bitcoin.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/bitcoin/bitcoin.mk +7 -0
index db9e9ab90c..a3ac45e104 100644
@@ -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))
Signature · 1 line
2.24.0
#8 lore raw

PATCH 1/8 package/bitcoin: depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735

In reply to Fabrice Fontaine
Quoted 10 lines · On Sun, 8 Dec 2019 17:27:18 +0100 Fabrice Fontaine…

Obviously, bitcoin depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735, not on BR2_TOOLCHAIN_HAS_GCC_BUG_64735

Fixes:
- No autobuilder failure

---
 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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#9 lore raw

PATCH 1/8 package/bitcoin: depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735

In reply to Fabrice Fontaine
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Obviously, bitcoin depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735, not on BR2_TOOLCHAIN_HAS_GCC_BUG_64735

Fixes:
- No autobuilder failure

Committed all 8 to 2019.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard