package/erlang: bump version to 21.0

Release notes: http://www.erlang.org/news/123

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch b/package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch
index c17eefc2a1d247e521082f256cd8b45cc4b219d3..2c976f539ecae5f0ebc09d637feb361e901980b2 100644 (file)
--- a/package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch
+++ b/package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch
@@ -16,6 +16,8 @@ Move INCLUDES before CFLAGS to use pcre.h from erlang.
 http://autobuild.buildroot.net/results/cbd/cbd8b54eef535f19d7d400fd269af1b3571d6143/build-end.log
 
 Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+[Bernd: rebased for erlang-21.0]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 ---
  erts/emulator/Makefile.in | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
@@ -24,20 +26,12 @@ diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
 index 7145824..d079487 100644
 --- a/erts/emulator/Makefile.in
 +++ b/erts/emulator/Makefile.in
-@@ -678,11 +678,11 @@ else
+@@ -712,7 +712,7 @@
  # Usually the same as the default rule, but certain platforms (e.g. win32) mix
  # different compilers
  $(OBJDIR)/beam_emu.o: beam/beam_emu.c
 -      $(V_EMU_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
 +      $(V_EMU_CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@
- endif
  
- $(OBJDIR)/%.o: beam/%.c
--      $(V_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
-+      $(V_CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@
- 
- $(OBJDIR)/%.o: $(TARGET)/%.c
-       $(V_CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -c $< -o $@
--- 
-1.9.3
-
+ $(OBJDIR)/beam_emu.S: beam/beam_emu.c
+       $(V_EMU_CC) -S -fverbose-asm $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@

diff --git a/package/erlang/erlang.hash b/package/erlang/erlang.hash
index f5ff74022cc7a1a56f2d2070375af82647d23cd8..616c85e9ae14f64fd6e18427873c4a40c22321a8 100644 (file)
--- a/package/erlang/erlang.hash
+++ b/package/erlang/erlang.hash
@@ -1,4 +1,4 @@
 # md5 from http://www.erlang.org/download/MD5, sha256 locally computed
-md5 a683c8c0aacfe0305c4bf47b3abfde6a  otp_src_20.3.tar.gz
-sha256 4e19e6c403d5255531c0b870f19511c8b8e3b080618e4f9efcb44d905935b2a1  otp_src_20.3.tar.gz
+md5 350988f024f88e9839c3715b35e7e27a  otp_src_21.0.tar.gz
+sha256 c7d247c0cad2d2e718eaca2e2dff051136a1347a92097abf19ebf65ea2870131  otp_src_21.0.tar.gz
 sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0  LICENSE.txt

diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk
index b7fdb6b9ceba358534e335967511bf6d6f2031ee..786641e4bd6e18bcb9e9d464f38c330e9e1efeff 100644 (file)
--- a/package/erlang/erlang.mk
+++ b/package/erlang/erlang.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 # See note below when updating Erlang
-ERLANG_VERSION = 20.3
+ERLANG_VERSION = 21.0
 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.10.1
+ERLANG_EI_VSN = 3.10.3
 
 # The configure checks for these functions fail incorrectly
 ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes