svn commit: r475871 - in head/lang: erlang-runtime20 erlang-runtime20/files erlang-runtime21 erlang-runtime21/files
Jean-Sébastien Pédron
dumbbell at FreeBSD.org
Mon Jul 30 09:14:41 UTC 2018
Author: dumbbell
Date: Mon Jul 30 09:14:40 2018
New Revision: 475871
URL: https://svnweb.freebsd.org/changeset/ports/475871
Log:
lang/erlang-runtime{20,21}: Add patch to fix build on i386
Those two ports fail to build on FreeBSD/i386 (all versions) for quite
some time. The Erlang/OTP team provided a patch after Dewayne Geraghty
reported the issue upstream.
Here is the entry in the Erlang/OTP bug tracker:
https://bugs.erlang.org/browse/ERL-677
The patch was successfully tested on FreeBSD 10.4 and 11.1, both i386
and amd64. Dewayne also confirmed success on FreeBSD 11.2.
PR: 229600
Reported by: Dewayne Geraghty <dewayne at heuristicsystems.com.au>
Obtained from: https://bugs.erlang.org/browse/ERL-677
MFH: 2018Q3
Added:
head/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c (contents, props changed)
head/lang/erlang-runtime21/files/patch-erts_emulator_beam_erl__alloc.c (contents, props changed)
Modified:
head/lang/erlang-runtime20/Makefile
head/lang/erlang-runtime21/Makefile
Modified: head/lang/erlang-runtime20/Makefile
==============================================================================
--- head/lang/erlang-runtime20/Makefile Mon Jul 30 09:07:53 2018 (r475870)
+++ head/lang/erlang-runtime20/Makefile Mon Jul 30 09:14:40 2018 (r475871)
@@ -3,6 +3,7 @@
PORTNAME= erlang
PORTVERSION= 20.3.8.3
+PORTREVISION= 1
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
http://erlang.stacken.kth.se/download/:erlangorg \
Added: head/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c Mon Jul 30 09:14:40 2018 (r475871)
@@ -0,0 +1,11 @@
+--- erts/emulator/beam/erl_alloc.c.orig 2018-03-13 20:11:05 UTC
++++ erts/emulator/beam/erl_alloc.c
+@@ -122,7 +122,7 @@ typedef union {
+ char align_afa[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(AFAllctr_t))];
+ AOFFAllctr_t aoffa;
+ char align_aoffa[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(AOFFAllctr_t))];
+-} ErtsAllocatorState_t;
++} ErtsAllocatorState_t erts_align_attribute(ERTS_CACHE_LINE_SIZE);
+
+ static ErtsAllocatorState_t std_alloc_state;
+ static ErtsAllocatorState_t ll_alloc_state;
Modified: head/lang/erlang-runtime21/Makefile
==============================================================================
--- head/lang/erlang-runtime21/Makefile Mon Jul 30 09:07:53 2018 (r475870)
+++ head/lang/erlang-runtime21/Makefile Mon Jul 30 09:14:40 2018 (r475871)
@@ -3,6 +3,7 @@
PORTNAME= erlang
PORTVERSION= 21.0.4
+PORTREVISION= 1
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
http://erlang.stacken.kth.se/download/:erlangorg \
Added: head/lang/erlang-runtime21/files/patch-erts_emulator_beam_erl__alloc.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/erlang-runtime21/files/patch-erts_emulator_beam_erl__alloc.c Mon Jul 30 09:14:40 2018 (r475871)
@@ -0,0 +1,11 @@
+--- erts/emulator/beam/erl_alloc.c.orig 2018-06-19 07:07:55 UTC
++++ erts/emulator/beam/erl_alloc.c
+@@ -114,7 +114,7 @@ typedef union {
+ char align_afa[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(AFAllctr_t))];
+ AOFFAllctr_t aoffa;
+ char align_aoffa[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(AOFFAllctr_t))];
+-} ErtsAllocatorState_t;
++} ErtsAllocatorState_t erts_align_attribute(ERTS_CACHE_LINE_SIZE);
+
+ static ErtsAllocatorState_t std_alloc_state;
+ static ErtsAllocatorState_t ll_alloc_state;
More information about the svn-ports-all
mailing list