From owner-svn-ports-head@freebsd.org Mon Jul 30 09:14:41 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B1BEC104FC2F; Mon, 30 Jul 2018 09:14:41 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 619068EDF5; Mon, 30 Jul 2018 09:14:41 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3803B2254A; Mon, 30 Jul 2018 09:14:41 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6U9EfXG018140; Mon, 30 Jul 2018 09:14:41 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6U9EeRF018136; Mon, 30 Jul 2018 09:14:40 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201807300914.w6U9EeRF018136@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= Date: Mon, 30 Jul 2018 09:14:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475871 - in head/lang: erlang-runtime20 erlang-runtime20/files erlang-runtime21 erlang-runtime21/files X-SVN-Group: ports-head X-SVN-Commit-Author: dumbbell X-SVN-Commit-Paths: in head/lang: erlang-runtime20 erlang-runtime20/files erlang-runtime21 erlang-runtime21/files X-SVN-Commit-Revision: 475871 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jul 2018 09:14:41 -0000 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 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;