svn commit: r476004 - in branches/2018Q3/lang: erlang-runtime20 erlang-runtime20/files erlang-runtime21 erlang-runtime21/files
Jean-Sébastien Pédron
dumbbell at FreeBSD.org
Tue Jul 31 14:50:08 UTC 2018
Author: dumbbell
Date: Tue Jul 31 14:50:06 2018
New Revision: 476004
URL: https://svnweb.freebsd.org/changeset/ports/476004
Log:
MFH: r475871
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
Approved by: portmgr (riggs)
Added:
branches/2018Q3/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c
- copied unchanged from r475871, head/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c
branches/2018Q3/lang/erlang-runtime21/files/patch-erts_emulator_beam_erl__alloc.c
- copied unchanged from r475871, head/lang/erlang-runtime21/files/patch-erts_emulator_beam_erl__alloc.c
Modified:
branches/2018Q3/lang/erlang-runtime20/Makefile
branches/2018Q3/lang/erlang-runtime21/Makefile
Directory Properties:
branches/2018Q3/ (props changed)
Modified: branches/2018Q3/lang/erlang-runtime20/Makefile
==============================================================================
--- branches/2018Q3/lang/erlang-runtime20/Makefile Tue Jul 31 14:28:29 2018 (r476003)
+++ branches/2018Q3/lang/erlang-runtime20/Makefile Tue Jul 31 14:50:06 2018 (r476004)
@@ -3,6 +3,7 @@
PORTNAME= erlang
PORTVERSION= 20.3.8.1
+PORTREVISION= 1
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
http://erlang.stacken.kth.se/download/:erlangorg \
Copied: branches/2018Q3/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c (from r475871, head/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q3/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c Tue Jul 31 14:50:06 2018 (r476004, copy of r475871, head/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c)
@@ -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: branches/2018Q3/lang/erlang-runtime21/Makefile
==============================================================================
--- branches/2018Q3/lang/erlang-runtime21/Makefile Tue Jul 31 14:28:29 2018 (r476003)
+++ branches/2018Q3/lang/erlang-runtime21/Makefile Tue Jul 31 14:50:06 2018 (r476004)
@@ -3,6 +3,7 @@
PORTNAME= erlang
PORTVERSION= 21.0.1
+PORTREVISION= 1
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
http://erlang.stacken.kth.se/download/:erlangorg \
Copied: branches/2018Q3/lang/erlang-runtime21/files/patch-erts_emulator_beam_erl__alloc.c (from r475871, head/lang/erlang-runtime21/files/patch-erts_emulator_beam_erl__alloc.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q3/lang/erlang-runtime21/files/patch-erts_emulator_beam_erl__alloc.c Tue Jul 31 14:50:06 2018 (r476004, copy of r475871, head/lang/erlang-runtime21/files/patch-erts_emulator_beam_erl__alloc.c)
@@ -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