erlang: Remove BR2_TOOLCHAIN_HAS_THREADS dependency

Erlang can be built without threads support, by passing an
appropriate config option.

This commit drops the config dependency on BR2_TOOLCHAIN_HAS_THREADS
and instead passes --disable-threads if the toolchain doesn't support
threads.

While here, change the wording of the config comment to "dynamic
library" to be consistent with similar comments elsewhere.

Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/erlang/Config.in b/package/erlang/Config.in
index 625b7c1b829fa951c50e6b842ce8051710e8a4c2..0ec01bb749b4f5f7e846baf52d3243e4d46019b5 100644 (file)
--- a/package/erlang/Config.in
+++ b/package/erlang/Config.in
@@ -1,12 +1,11 @@
-comment "erlang needs a toolchain w/ threads, shared library"
+comment "erlang needs a toolchain w/ dynamic library"
        depends on BR2_USE_MMU # fork()
        depends on BR2_PACKAGE_LIBATOMIC_ARCH_SUPPORTS
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+       depends on BR2_STATIC_LIBS
 
 config BR2_PACKAGE_ERLANG
        bool "erlang"
        depends on BR2_USE_MMU # fork()
-       depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on !BR2_STATIC_LIBS
        depends on BR2_PACKAGE_LIBATOMIC_ARCH_SUPPORTS
        select BR2_PACKAGE_LIBATOMIC_OPS

diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk
index 499f62c1539b497a254ddd893fb3d1f2daee17d6..848d1ddc44c560179db6e58b3a50e4f165173b54 100644 (file)
--- a/package/erlang/erlang.mk
+++ b/package/erlang/erlang.mk
@@ -40,6 +40,10 @@ HOST_ERLANG_CONF_OPTS = --without-javac --with-ssl=$(HOST_DIR)/usr
 
 HOST_ERLANG_CONF_OPTS += --without-termcap
 
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
+ERLANG_CONF_OPTS += --disable-threads
+endif
+
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 ERLANG_CONF_OPTS += --with-termcap
 ERLANG_DEPENDENCIES += ncurses