package/erlang: bump to version 22.3.4.22
- Drop third patch (already in version)
- Fix build failure with autoconf >= 2.70 raised since commit
ecd54b65c1
Fixes:
- http://autobuild.buildroot.org/results/4f52b2f194dcfd619fefb192d1c0fd070d5bd408
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine
Thomas Petazzoni
parent
d1d93d488c
commit
2ad6a3a428
|
|
@ -1,54 +0,0 @@
|
|||
From de870d7f9f36b3e68f280057851a4585a67ab219 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
Date: Tue, 14 Jan 2020 23:15:01 +0000
|
||||
Subject: [PATCH] ei_portio.h: avoid ODR violation of
|
||||
'ei_default_socket_callbacks'
|
||||
|
||||
Noticed as a build failure against fresh gcc-master:
|
||||
|
||||
```
|
||||
LD otp/lib/erl_interface/bin/x86_64-unknown-linux-gnu/erl_call
|
||||
ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(eirecv.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here
|
||||
ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(send.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here
|
||||
ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(send_reg.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here
|
||||
ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(epmd_port.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here
|
||||
ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_portio.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here
|
||||
collect2: error: ld returned 1 exit status
|
||||
make[3]: *** [x86_64-unknown-linux-gnu/Makefile:669: otp/lib/erl_interface/bin/x86_64-unknown-linux-gnu/erl_call] Error 1
|
||||
```
|
||||
|
||||
The failure looks legitimate: `ei_default_socket_callbacks` is a
|
||||
struct defined in 'ei_portio.h' and in 'ei_portio.c'.
|
||||
|
||||
The change flips 'ei_portio.h' definition to declaration.
|
||||
|
||||
gcc-10 will change the default from -fcommon to fno-common:
|
||||
https://gcc.gnu.org/PR85678.
|
||||
|
||||
The error also happens if CFLAGS=-fno-common passed explicitly.
|
||||
|
||||
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
|
||||
Patch taken from upstream: https://github.com/erlang/otp/commit/de870d7f9f36b3e68f280057851a4585a67ab219
|
||||
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
|
||||
---
|
||||
lib/erl_interface/src/misc/ei_portio.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/erl_interface/src/misc/ei_portio.h b/lib/erl_interface/src/misc/ei_portio.h
|
||||
index 84ebc5039a..5172d085b4 100644
|
||||
|
||||
--- a/lib/erl_interface/src/misc/ei_portio.h
|
||||
+++ b/lib/erl_interface/src/misc/ei_portio.h
|
||||
@@ -47,7 +47,7 @@ int ei_writev_fill_ctx_t__(ei_socket_callbacks *cbs, void *ctx, const struct iov
|
||||
int ei_socket_callbacks_have_writev__(ei_socket_callbacks *cbs);
|
||||
#endif
|
||||
|
||||
-ei_socket_callbacks ei_default_socket_callbacks;
|
||||
+extern ei_socket_callbacks ei_default_socket_callbacks;
|
||||
|
||||
#define EI_FD_AS_CTX__(FD) \
|
||||
((void *) (long) (FD))
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
# md5 from http://www.erlang.org/download/MD5, sha256 locally computed
|
||||
md5 b2b48dad6e69c1e882843edbf2abcfd3 otp_src_22.2.tar.gz
|
||||
sha256 89c2480cdac566065577c82704a48e10f89cf2e6ca5ab99e1cf80027784c678f otp_src_22.2.tar.gz
|
||||
sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE.txt
|
||||
# From https://github.com/erlang/otp/releases/download/OTP-22.3.4.22/SHA256.txt
|
||||
sha256 e7f0793e62f8da4f7551dc9c1c0de76c40f19773ba516121fc56315c840f60cc otp_src_22.3.4.22.tar.gz
|
||||
|
||||
# Hash for license file
|
||||
sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE.txt
|
||||
|
|
|
|||
7
package/erlang/erlang.mk
vendored
7
package/erlang/erlang.mk
vendored
|
|
@ -5,8 +5,9 @@
|
|||
################################################################################
|
||||
|
||||
# See note below when updating Erlang
|
||||
ERLANG_VERSION = 22.2
|
||||
ERLANG_SITE = http://www.erlang.org/download
|
||||
ERLANG_VERSION = 22.3.4.22
|
||||
ERLANG_SITE = \
|
||||
https://github.com/erlang/otp/releases/download/OTP-$(ERLANG_VERSION)
|
||||
ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz
|
||||
ERLANG_DEPENDENCIES = host-erlang
|
||||
|
||||
|
|
@ -37,7 +38,7 @@ HOST_ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF
|
|||
|
||||
# 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.13.1
|
||||
ERLANG_EI_VSN = 3.13.2.2
|
||||
|
||||
# The configure checks for these functions fail incorrectly
|
||||
ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes
|
||||
|
|
|
|||
Loading…
Reference in a new issue