summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/erlang/Config.in1
-rw-r--r--package/erlang/erlang.mk3
2 files changed, 2 insertions, 2 deletions
diff --git a/package/erlang/Config.in b/package/erlang/Config.in
index 75ba17086a..ab87eab6ff 100644
--- a/package/erlang/Config.in
+++ b/package/erlang/Config.in
@@ -23,6 +23,7 @@ config BR2_PACKAGE_ERLANG
depends on !BR2_STATIC_LIBS
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_PACKAGE_ERLANG_ARCH_SUPPORTS
+ select BR2_PACKAGE_ZLIB
help
Erlang is a programming language used to build massively
scalable soft real-time systems with requirements on high
diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk
index 2ac903ffea..ca0aa0b770 100644
--- a/package/erlang/erlang.mk
+++ b/package/erlang/erlang.mk
@@ -64,10 +64,9 @@ else
ERLANG_CONF_OPTS += --without-odbc
endif
-ifeq ($(BR2_PACKAGE_ZLIB),y)
+# Always use Buildroot's zlib
ERLANG_CONF_OPTS += --enable-shared-zlib
ERLANG_DEPENDENCIES += zlib
-endif
# Remove source, example, gs and wx files from staging and target.
ERLANG_REMOVE_PACKAGES = gs wx
OpenPOWER on IntegriCloud