Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -1,79 +0,0 @@
|
||||
Status: upstream
|
||||
https://github.com/erlang/otp/pull/658
|
||||
|
||||
Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
|
||||
|
||||
From 73392fcb6f8fddba57de6fb7ae6eeafa0e444686 Mon Sep 17 00:00:00 2001
|
||||
From: Johan Oudinet <johan.oudinet@gmail.com>
|
||||
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 <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
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 <stdio.h>
|
||||
- #ifdef __GLIBC__
|
||||
- yes
|
||||
- #endif
|
||||
+ AC_EGREP_CPP(^yes$,[
|
||||
+#include <stdio.h>
|
||||
+#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 <openssl/opensslv.h>
|
||||
#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 <openssl/opensslconf.h>
|
||||
#ifndef OPENSSL_NO_KRB5
|
||||
- yes
|
||||
+yes
|
||||
#endif
|
||||
],[
|
||||
AC_MSG_RESULT([yes])
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -1,14 +1,20 @@
|
||||
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
|
||||
|
||||
comment "erlang needs a toolchain w/ dynamic library"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS
|
||||
depends on BR2_PACKAGE_ERLANG_ARCH_SUPPORTS
|
||||
depends on BR2_STATIC_LIBS
|
||||
|
||||
config BR2_PACKAGE_ERLANG
|
||||
bool "erlang"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS
|
||||
select BR2_PACKAGE_LIBATOMIC_OPS
|
||||
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.
|
||||
|
||||
@@ -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 7e4ff32f97c36fb3dab736f8d481830b otp_src_18.3.tar.gz
|
||||
sha256 fdab8129a1cb935db09f1832e3a7d511a4aeb2b9bb3602ca6a7ccb9730d5c9c3 otp_src_18.3.tar.gz
|
||||
|
||||
26
bsp/buildroot/package/erlang/erlang.mk
vendored
26
bsp/buildroot/package/erlang/erlang.mk
vendored
@@ -5,21 +5,21 @@
|
||||
################################################################################
|
||||
|
||||
# See note below when updating Erlang
|
||||
ERLANG_VERSION = 17.5
|
||||
ERLANG_VERSION = 18.3
|
||||
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.2
|
||||
|
||||
# The configure checks for these functions fail incorrectly
|
||||
ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes
|
||||
@@ -30,9 +30,6 @@ ERLANG_CONF_ENV += erl_xcomp_sysroot=$(STAGING_DIR)
|
||||
|
||||
ERLANG_CONF_OPTS = --without-javac
|
||||
|
||||
ERLANG_DEPENDENCIES += libatomic_ops
|
||||
ERLANG_CONF_OPTS += --with-libatomic_ops=$(STAGING_DIR)/usr LIBS=-latomic_ops
|
||||
|
||||
# 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
|
||||
@@ -67,14 +64,20 @@ ifeq ($(BR2_PACKAGE_ERLANG_SMP),)
|
||||
ERLANG_CONF_OPTS += --disable-smp-support
|
||||
endif
|
||||
|
||||
# Remove source, example, gs and wx files from the target
|
||||
# Remove source, example, gs and wx files from staging and target.
|
||||
ERLANG_REMOVE_PACKAGES = gs wx
|
||||
|
||||
ifneq ($(BR2_PACKAGE_ERLANG_MEGACO),y)
|
||||
ERLANG_REMOVE_PACKAGES += megaco
|
||||
endif
|
||||
|
||||
define ERLANG_REMOVE_UNUSED
|
||||
define ERLANG_REMOVE_STAGING_UNUSED
|
||||
for package in $(ERLANG_REMOVE_PACKAGES); do \
|
||||
rm -rf $(STAGING_DIR)/usr/lib/erlang/lib/$${package}-*; \
|
||||
done
|
||||
endef
|
||||
|
||||
define ERLANG_REMOVE_TARGET_UNUSED
|
||||
find $(TARGET_DIR)/usr/lib/erlang -type d -name src -prune -exec rm -rf {} \;
|
||||
find $(TARGET_DIR)/usr/lib/erlang -type d -name examples -prune -exec rm -rf {} \;
|
||||
for package in $(ERLANG_REMOVE_PACKAGES); do \
|
||||
@@ -82,7 +85,8 @@ define ERLANG_REMOVE_UNUSED
|
||||
done
|
||||
endef
|
||||
|
||||
ERLANG_POST_INSTALL_TARGET_HOOKS += ERLANG_REMOVE_UNUSED
|
||||
ERLANG_POST_INSTALL_STAGING_HOOKS += ERLANG_REMOVE_STAGING_UNUSED
|
||||
ERLANG_POST_INSTALL_TARGET_HOOKS += ERLANG_REMOVE_TARGET_UNUSED
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user