diff mbox series

[1/1] package/python-autobahn: fix dependencies

Message ID 20220813084815.696873-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/1] package/python-autobahn: fix dependencies | expand

Commit Message

Fabrice Fontaine Aug. 13, 2022, 8:48 a.m. UTC 
Commit efa5ff1489625eb862b1d7d161a169514cc9c881 forgot to add reverse
dependencies resulting in the following build failure:

Makefile:575: *** snappy is in the dependency chain of python-snappy that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in.  Stop.

Fixes:
 - http://autobuild.buildroot.org/results/fc4fdc29ff4ab3e1585a42ed6b063e9e50583fe9

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/python-autobahn/Config.in | 9 +++++++++
 package/python-crossbar/Config.in | 6 ++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

Comments

Thomas Petazzoni Aug. 14, 2022, 10:09 a.m. UTC | #1 
On Sat, 13 Aug 2022 10:48:15 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Commit efa5ff1489625eb862b1d7d161a169514cc9c881 forgot to add reverse
> dependencies resulting in the following build failure:
> 
> Makefile:575: *** snappy is in the dependency chain of python-snappy that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in.  Stop.
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/fc4fdc29ff4ab3e1585a42ed6b063e9e50583fe9
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/python-autobahn/Config.in | 9 +++++++++
>  package/python-crossbar/Config.in | 6 ++++--
>  2 files changed, 13 insertions(+), 2 deletions(-)

Sorry for having missed those dependencies when reviewing/reworking
these patches. So, thanks for fixing this mess! Applied to master!

Thomas
diff mbox series

Patch

diff --git a/package/python-autobahn/Config.in b/package/python-autobahn/Config.in
index c9caa1f1c4..527416a3cd 100644
--- a/package/python-autobahn/Config.in
+++ b/package/python-autobahn/Config.in
@@ -19,10 +19,15 @@  config BR2_PACKAGE_PYTHON_AUTOBAHN_ACCELERATE
 
 config BR2_PACKAGE_PYTHON_AUTOBAHN_COMPRESS
 	bool "Non-standard WebSocket compression support"
+	depends on BR2_INSTALL_LIBSTDCPP # python-snappy -> snappy
 	select BR2_PACKAGE_PYTHON_SNAPPY # runtime
 
+comment "Non-standard WebSocket compression needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
 config BR2_PACKAGE_PYTHON_AUTOBAHN_ENCRYPTION
 	bool "TLS and WAMP-cryptosign encryption/authentication support"
+	depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-pyopenssl -> python-cryptography
 	select BR2_PACKAGE_PYTHON_PYNACL # runtime
 	select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime
 	select BR2_PACKAGE_PYTHON_QRCODE # runtime
@@ -37,12 +42,16 @@  config BR2_PACKAGE_PYTHON_AUTOBAHN_SCRAM
 
 config BR2_PACKAGE_PYTHON_AUTOBAHN_SERIALIZATION
 	bool "Accelerated JSON, MessagePack, CBOR, UBJSON, and FlatBuffers serialization support"
+	depends on BR2_INSTALL_LIBSTDCPP # python-ujson
 	select BR2_PACKAGE_PYTHON_CBOR2 # runtime
 	select BR2_PACKAGE_PYTHON_FLATBUFFERS # runtime
 	select BR2_PACKAGE_PYTHON_MSGPACK # runtime
 	select BR2_PACKAGE_PYTHON_UBJSON # runtime
 	select BR2_PACKAGE_PYTHON_UJSON # runtime
 
+comment "Accelerated JSON, MessagePack, CBOR, UBJSON, and FlatBuffers serialization needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
 config BR2_PACKAGE_PYTHON_AUTOBAHN_TWISTED
 	bool "Twisted support"
 	select BR2_PACKAGE_PYTHON_ATTRS # runtime
diff --git a/package/python-crossbar/Config.in b/package/python-crossbar/Config.in
index fb06f7672a..aadcb2c360 100644
--- a/package/python-crossbar/Config.in
+++ b/package/python-crossbar/Config.in
@@ -3,6 +3,7 @@  config BR2_PACKAGE_PYTHON_CROSSBAR
 	depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography
 	depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy
 	depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy
+	depends on BR2_INSTALL_LIBSTDCPP # python-autobahn's compress and serialization
 	# All the following dependencies are runtime dependencies. It
 	# matches almost 1:1 the requirements-min.txt from crossbar
 	# with the following exceptions:
@@ -63,7 +64,8 @@  config BR2_PACKAGE_PYTHON_CROSSBAR
 
 	  https://pypi.python.org/pypi/crossbar
 
-comment "python-crossbar needs glibc or musl"
+comment "python-crossbar needs a glibc or musl toolchain w/ C++"
 	depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
-	depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
+	depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \
+		!BR2_INSTALL_LIBSTDCPP