Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -1,13 +0,0 @@
|
||||
apply-patches.sh deletes this file from the source directory.
|
||||
|
||||
--- erlang-R15B01.old/lib/tools/emacs/Makefile 2012-04-04
|
||||
+++ erlang-R15B01/lib/tools/emacs/Makefile 2012-04-04 15:55:16.978957307 +0100
|
||||
@@ -51,7 +51,7 @@
|
||||
|
||||
ELC_FILES = $(EMACS_FILES:%=%.elc)
|
||||
|
||||
-TEST_FILES = test.erl.indented test.erl.orig
|
||||
+TEST_FILES = test.erl.indented
|
||||
|
||||
# ----------------------------------------------------
|
||||
# Targets
|
||||
@@ -0,0 +1,42 @@
|
||||
From 011752ec7b31e3dde376270fc65c7ee70644f6e7 Mon Sep 17 00:00:00 2001
|
||||
From: Johan Oudinet <johan.oudinet@gmail.com>
|
||||
Date: Wed, 6 Dec 2017 15:01:17 +0100
|
||||
Subject: [PATCH] Link with LDLIBS instead of LIBS for DED
|
||||
|
||||
Fix ERL-529 by avoiding to link with libz for no reason.
|
||||
|
||||
Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
|
||||
---
|
||||
lib/asn1/c_src/Makefile | 2 +-
|
||||
lib/runtime_tools/c_src/Makefile.in | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
|
||||
index 1f714df357..f7c6b8b9bc 100644
|
||||
--- a/lib/asn1/c_src/Makefile
|
||||
+++ b/lib/asn1/c_src/Makefile
|
||||
@@ -126,7 +126,7 @@ $(NIF_LIB_FILE): $(NIF_STATIC_OBJ_FILES)
|
||||
$(V_RANLIB) $@
|
||||
|
||||
$(NIF_SHARED_OBJ_FILE): $(NIF_OBJ_FILES)
|
||||
- $(V_LD) $(LDFLAGS) -o $(NIF_SHARED_OBJ_FILE) $(NIF_OBJ_FILES) $(CLIB_FLAGS) $(LIBS)
|
||||
+ $(V_LD) $(LDFLAGS) -o $(NIF_SHARED_OBJ_FILE) $(NIF_OBJ_FILES) $(CLIB_FLAGS) $(LDLIBS)
|
||||
|
||||
# ----------------------------------------------------
|
||||
# Release Target
|
||||
diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in
|
||||
index 4530a83aee..4e13e0d789 100644
|
||||
--- a/lib/runtime_tools/c_src/Makefile.in
|
||||
+++ b/lib/runtime_tools/c_src/Makefile.in
|
||||
@@ -95,7 +95,7 @@ $(OBJDIR)/%$(TYPEMARKER).o: %.c dyntrace_lttng.h
|
||||
$(V_CC) -c -o $@ $(ALL_CFLAGS) $<
|
||||
|
||||
$(LIBDIR)/%$(TYPEMARKER).@DED_EXT@: $(OBJDIR)/%$(TYPEMARKER).o
|
||||
- $(V_LD) $(LDFLAGS) -o $@ $^ $(LIBS)
|
||||
+ $(V_LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
|
||||
|
||||
clean:
|
||||
rm -f $(TRACE_LIBS)
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -1,9 +1,16 @@
|
||||
config BR2_PACKAGE_HOST_ERLANG_ARCH_SUPPORTS
|
||||
bool
|
||||
default y if BR2_HOSTARCH = "x86_64"
|
||||
default y if BR2_HOSTARCH = "x86"
|
||||
|
||||
config BR2_PACKAGE_ERLANG_ARCH_SUPPORTS
|
||||
bool
|
||||
# see HOWTO/INSTALL.md for Erlang's supported platforms
|
||||
# when using its native atomic ops implementation
|
||||
default y if BR2_i386 || BR2_x86_64 || BR2_powerpc || \
|
||||
BR2_sparc_v9 || BR2_arm || BR2_aarch64 || BR2_mipsel
|
||||
# erlang needs host-erlang
|
||||
depends on BR2_PACKAGE_HOST_ERLANG_ARCH_SUPPORTS
|
||||
|
||||
comment "erlang needs a toolchain w/ dynamic library"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
@@ -16,31 +23,23 @@ config BR2_PACKAGE_ERLANG
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_PACKAGE_ERLANG_ARCH_SUPPORTS
|
||||
help
|
||||
Erlang is a programming language used to build massively scalable
|
||||
soft real-time systems with requirements on high availability.
|
||||
Some of its uses are in telecoms, banking, e-commerce, computer
|
||||
telephony and instant messaging. Erlang's runtime system has
|
||||
built-in support for concurrency, distribution and fault tolerance.
|
||||
Erlang is a programming language used to build massively
|
||||
scalable soft real-time systems with requirements on high
|
||||
availability. Some of its uses are in telecoms, banking,
|
||||
e-commerce, computer telephony and instant messaging.
|
||||
Erlang's runtime system has built-in support for
|
||||
concurrency, distribution and fault tolerance.
|
||||
|
||||
http://www.erlang.org
|
||||
|
||||
if BR2_PACKAGE_ERLANG
|
||||
|
||||
config BR2_PACKAGE_ERLANG_SMP
|
||||
bool "enable SMP support"
|
||||
help
|
||||
Erlang provides both a UP and an SMP emulator. The UP emulator
|
||||
is always built, and this option enables compilation of the SMP
|
||||
emulator. The choice of which emulator to use is made at runtime.
|
||||
If you do not need SMP support, turning this option off reduces
|
||||
compile time and the size of the Erlang installation.
|
||||
|
||||
config BR2_PACKAGE_ERLANG_MEGACO
|
||||
bool "install megaco application"
|
||||
help
|
||||
The Megaco application is a framework for building applications
|
||||
on top of the Megaco/H.248 protocol. It is approximately 14MB in
|
||||
size so if you do not need it then it is recommended not to
|
||||
enable it.
|
||||
The Megaco application is a framework for building
|
||||
applications on top of the Megaco/H.248 protocol. It is
|
||||
approximately 14MB in size so if you do not need it then
|
||||
it is recommended not to enable it.
|
||||
|
||||
endif # BR2_PACKAGE_ERLANG
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
# md5 from http://www.erlang.org/download/MD5, sha256 locally computed
|
||||
md5 7e4ff32f97c36fb3dab736f8d481830b otp_src_18.3.tar.gz
|
||||
sha256 fdab8129a1cb935db09f1832e3a7d511a4aeb2b9bb3602ca6a7ccb9730d5c9c3 otp_src_18.3.tar.gz
|
||||
md5 a683c8c0aacfe0305c4bf47b3abfde6a otp_src_20.3.tar.gz
|
||||
sha256 4e19e6c403d5255531c0b870f19511c8b8e3b080618e4f9efcb44d905935b2a1 otp_src_20.3.tar.gz
|
||||
sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE.txt
|
||||
|
||||
10
bsp/buildroot/package/erlang/erlang.mk
vendored
10
bsp/buildroot/package/erlang/erlang.mk
vendored
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
# See note below when updating Erlang
|
||||
ERLANG_VERSION = 18.3
|
||||
ERLANG_VERSION = 20.3
|
||||
ERLANG_SITE = http://www.erlang.org/download
|
||||
ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz
|
||||
ERLANG_DEPENDENCIES = host-erlang
|
||||
@@ -19,7 +19,7 @@ ERLANG_AUTORECONF = YES
|
||||
|
||||
# Whenever updating Erlang, this value should be updated as well, to the
|
||||
# value of EI_VSN in the file lib/erl_interface/vsn.mk
|
||||
ERLANG_EI_VSN = 3.8.2
|
||||
ERLANG_EI_VSN = 3.10.1
|
||||
|
||||
# The configure checks for these functions fail incorrectly
|
||||
ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes
|
||||
@@ -39,7 +39,7 @@ HOST_ERLANG_CONF_ENV += ERL_TOP=$(@D)
|
||||
# erlang uses openssl for all things crypto. Since the host tools (such as
|
||||
# rebar) uses crypto, we need to build host-erlang with support for openssl.
|
||||
HOST_ERLANG_DEPENDENCIES = host-openssl
|
||||
HOST_ERLANG_CONF_OPTS = --without-javac --with-ssl=$(HOST_DIR)/usr
|
||||
HOST_ERLANG_CONF_OPTS = --without-javac --with-ssl=$(HOST_DIR)
|
||||
|
||||
HOST_ERLANG_CONF_OPTS += --without-termcap
|
||||
|
||||
@@ -74,10 +74,6 @@ ERLANG_CONF_OPTS += --enable-shared-zlib
|
||||
ERLANG_DEPENDENCIES += zlib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ERLANG_SMP),)
|
||||
ERLANG_CONF_OPTS += --disable-smp-support
|
||||
endif
|
||||
|
||||
# Remove source, example, gs and wx files from staging and target.
|
||||
ERLANG_REMOVE_PACKAGES = gs wx
|
||||
|
||||
|
||||
Reference in New Issue
Block a user