diff options
| author | Ezequiel García <ezequiel@vanguardiasur.com.ar> | 2015-10-20 10:54:46 -0300 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-10-21 22:12:05 +0200 |
| commit | cbcecc2453ec7f94d82f32a1acd33a09e576ecee (patch) | |
| tree | 5dac2ab42509187173a2b09079eef93bcfb098fe /package/erlang | |
| parent | 6604119823b4f59b60b87de2b62621f673eede96 (diff) | |
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>
Diffstat (limited to 'package/erlang')
| -rw-r--r-- | package/erlang/Config.in | 5 | ||||
| -rw-r--r-- | package/erlang/erlang.mk | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/package/erlang/Config.in b/package/erlang/Config.in index 625b7c1b8..0ec01bb74 100644 --- 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 499f62c15..848d1ddc4 100644 --- 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 |