From mboxrd@z Thu Jan 1 00:00:00 1970 From: Romain Naour Date: Sat, 6 Feb 2016 23:28:44 +0100 Subject: [Buildroot] [PATCH v2 01/18] erlang: bump to version 18.2.1 In-Reply-To: <1454443064-14269-2-git-send-email-fhunleth@troodon-software.com> References: <1454443064-14269-1-git-send-email-fhunleth@troodon-software.com> <1454443064-14269-2-git-send-email-fhunleth@troodon-software.com> Message-ID: <56B6739C.6010009@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Hi Frank, All, Le 02/02/2016 20:57, Frank Hunleth a ?crit : > This is a major release of Erlang that includes a licensing change from > the EPL to the Apache License, significant changes to the timer APIs, better > support for large maps, and security improvements. > > Signed-off-by: Frank Hunleth Reviewed-by: Romain Naour The complete series has been tested with legal-info to check if the new license is correct. Best regards, Romain > --- > Changes v1 -> v2: > - Add sha256 as suggested by Romain > - Update autoreconf comment now that reason changed > > ...04-erts-fix-incorrect-use-of-ac-egrep-cpp.patch | 79 ---------------------- > package/erlang/erlang.hash | 5 +- > package/erlang/erlang.mk | 10 +-- > 3 files changed, 8 insertions(+), 86 deletions(-) > delete mode 100644 package/erlang/0004-erts-fix-incorrect-use-of-ac-egrep-cpp.patch > > diff --git a/package/erlang/0004-erts-fix-incorrect-use-of-ac-egrep-cpp.patch b/package/erlang/0004-erts-fix-incorrect-use-of-ac-egrep-cpp.patch > deleted file mode 100644 > index bc08697..0000000 > --- a/package/erlang/0004-erts-fix-incorrect-use-of-ac-egrep-cpp.patch > +++ /dev/null > @@ -1,79 +0,0 @@ > -Status: upstream > -https://github.com/erlang/otp/pull/658 > - > -Signed-off-by: Johan Oudinet > - > -From 73392fcb6f8fddba57de6fb7ae6eeafa0e444686 Mon Sep 17 00:00:00 2001 > -From: Johan Oudinet > -Date: Tue, 24 Mar 2015 15:54:31 +0100 > -Subject: [PATCH] erts: Fix incorrect use of AC_EGREP_CPP > - > -Using 'AC_EGREP_CPP(yes' without restraining the pattern always return > -true if it runs from a path containing the string 'yes'. > ---- > - erts/aclocal.m4 | 2 +- > - erts/configure.in | 17 +++++++++-------- > - 2 files changed, 10 insertions(+), 9 deletions(-) > - > -diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 > -index 5735cde..70a5b40 100644 > ---- a/erts/aclocal.m4 > -+++ b/erts/aclocal.m4 > -@@ -559,7 +559,7 @@ dnl > - > - AC_DEFUN(LM_SYS_MULTICAST, > - [AC_CACHE_CHECK([for multicast support], ac_cv_sys_multicast_support, > --[AC_EGREP_CPP(yes, > -+[AC_EGREP_CPP(^yes$, > - [#include > - #include > - #include > -diff --git a/erts/configure.in b/erts/configure.in > -index b3fe48d..9e19e33 100644 > ---- a/erts/configure.in > -+++ b/erts/configure.in > -@@ -1555,10 +1555,11 @@ if test "$have_gethostbyname_r" = yes; then > - [Define to flavour of gethostbyname_r])) > - ;; > - *) > -- AC_EGREP_CPP(yes,[#include > -- #ifdef __GLIBC__ > -- yes > -- #endif > -+ AC_EGREP_CPP(^yes$,[ > -+#include > -+#ifdef __GLIBC__ > -+yes > -+#endif > - ], AC_DEFINE(HAVE_GETHOSTBYNAME_R, GHBN_R_GLIBC, > - [Define to flavour of gethostbyname_r])) > - ;; > -@@ -4303,10 +4304,10 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in > - SSL_INCLUDE="-I$dir/include" > - old_CPPFLAGS=$CPPFLAGS > - CPPFLAGS=$SSL_INCLUDE > -- AC_EGREP_CPP(yes,[ > -+ AC_EGREP_CPP(^yes$,[ > - #include > - #if OPENSSL_VERSION_NUMBER >= 0x0090700fL > -- yes > -+yes > - #endif > - ],[ > - ssl_found=yes > -@@ -4501,10 +4502,10 @@ if test "x$SSL_APP" != "x" ; then > - AC_MSG_CHECKING(for OpenSSL kerberos 5 support) > - old_CPPFLAGS=$CPPFLAGS > - CPPFLAGS=$SSL_INCLUDE > -- AC_EGREP_CPP(yes,[ > -+ AC_EGREP_CPP(^yes$,[ > - #include > - #ifndef OPENSSL_NO_KRB5 > -- yes > -+yes > - #endif > - ],[ > - AC_MSG_RESULT([yes]) > --- > -2.1.0 > - > diff --git a/package/erlang/erlang.hash b/package/erlang/erlang.hash > index 2d6a39a..f6519af 100644 > --- a/package/erlang/erlang.hash > +++ b/package/erlang/erlang.hash > @@ -1,2 +1,3 @@ > -# From http://www.erlang.org/download/MD5 > -md5 346dd0136bf1cc28cebc140e505206bb otp_src_17.5.tar.gz > +# md5 from http://www.erlang.org/download/MD5, sha256 locally computed > +md5 ebb226d51f89ec54cc83ce5d417ce55e otp_src_18.2.1.tar.gz > +sha256 82d76ebfeeda5db64ea5b0f1a04aa0e9ac63380b278722e0e6052249bd3fe39a otp_src_18.2.1.tar.gz > diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk > index 848d1dd..638d2c2 100644 > --- a/package/erlang/erlang.mk > +++ b/package/erlang/erlang.mk > @@ -5,21 +5,21 @@ > ################################################################################ > > # See note below when updating Erlang > -ERLANG_VERSION = 17.5 > +ERLANG_VERSION = 18.2.1 > ERLANG_SITE = http://www.erlang.org/download > ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz > ERLANG_DEPENDENCIES = host-erlang > > -ERLANG_LICENSE = EPL > -ERLANG_LICENSE_FILES = EPLICENCE > +ERLANG_LICENSE = Apache-2.0 > +ERLANG_LICENSE_FILES = LICENSE.txt > ERLANG_INSTALL_STAGING = YES > > -# Touching erts/configure.in > +# Patched erts/aclocal.m4 > 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.7.20 > +ERLANG_EI_VSN = 3.8.1 > > # The configure checks for these functions fail incorrectly > ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes >