From owner-dev-commits-ports-all@freebsd.org Fri Oct 1 12:51:30 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DE96C6AE8B3; Fri, 1 Oct 2021 12:51:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HLVNf56Gzz3v5D; Fri, 1 Oct 2021 12:51:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7F70D1FC57; Fri, 1 Oct 2021 12:51:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 191CpUUq078469; Fri, 1 Oct 2021 12:51:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 191CpU68078468; Fri, 1 Oct 2021 12:51:30 GMT (envelope-from git) Date: Fri, 1 Oct 2021 12:51:30 GMT Message-Id: <202110011251.191CpU68078468@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: b8b32707f322 - main - devel/stack: Add aarch64 support. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8b32707f322a10b98d9cec7f818954e65d7d57b Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Oct 2021 12:51:31 -0000 The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=b8b32707f322a10b98d9cec7f818954e65d7d57b commit b8b32707f322a10b98d9cec7f818954e65d7d57b Author: Mikael Urankar AuthorDate: 2021-10-01 12:46:23 +0000 Commit: Mikael Urankar CommitDate: 2021-10-01 12:51:04 +0000 devel/stack: Add aarch64 support. Approved by: arrowd Differential Revision: https://reviews.freebsd.org/D32221 --- devel/stack/Makefile | 6 ++++++ ...__cabal__deps_cryptonite-0.29_cbits_decaf_include_word.h | 13 +++++++++++++ devel/stack/files/patch-src_Stack_Setup.hs | 12 ++++++++++++ 3 files changed, 31 insertions(+) diff --git a/devel/stack/Makefile b/devel/stack/Makefile index e7c331c4ae47..d6097f2e31ce 100644 --- a/devel/stack/Makefile +++ b/devel/stack/Makefile @@ -189,6 +189,12 @@ USE_CABAL= Glob-0.10.1_1 \ .include +.if ${ARCH} == aarch64 +# Keep it in sync with LLVM_VERSION in lang/ghc +LLVM_VERSION= 10 +RUN_DEPENDS+= llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION} +.endif + .if ${OSVERSION} >= 1300078 && ${ARCH} != powerpc64 LIB_DEPENDS+= libncursesw.so.8:misc/compat12x .endif diff --git a/devel/stack/files/patch-__cabal__deps_cryptonite-0.29_cbits_decaf_include_word.h b/devel/stack/files/patch-__cabal__deps_cryptonite-0.29_cbits_decaf_include_word.h new file mode 100644 index 000000000000..2d34e0825ca0 --- /dev/null +++ b/devel/stack/files/patch-__cabal__deps_cryptonite-0.29_cbits_decaf_include_word.h @@ -0,0 +1,13 @@ +https://github.com/haskell-crypto/cryptonite/issues/350 + +--- _cabal_deps/cryptonite-0.29/cbits/decaf/include/word.h.orig 2019-09-08 00:46:48 UTC ++++ _cabal_deps/cryptonite-0.29/cbits/decaf/include/word.h +@@ -238,7 +238,7 @@ malloc_vector(size_t size) { + /* PERF: vectorize vs unroll */ + #ifdef __clang__ + #if 100*__clang_major__ + __clang_minor__ > 305 +-#define UNROLL _Pragma("clang loop unroll(full)") ++//#define UNROLL _Pragma("clang loop unroll(full)") + #endif + #endif + diff --git a/devel/stack/files/patch-src_Stack_Setup.hs b/devel/stack/files/patch-src_Stack_Setup.hs new file mode 100644 index 000000000000..854e0414d9b4 --- /dev/null +++ b/devel/stack/files/patch-src_Stack_Setup.hs @@ -0,0 +1,12 @@ +https://github.com/commercialhaskell/stack/pull/5622 + +--- src/Stack/Setup.hs.orig 2021-07-19 21:35:32 UTC ++++ src/Stack/Setup.hs +@@ -1266,6 +1266,7 @@ getOSKey platform = + Platform Arm Cabal.Linux -> return "linux-armv7" + Platform AArch64 Cabal.Linux -> return "linux-aarch64" + Platform Sparc Cabal.Linux -> return "linux-sparc" ++ Platform AArch64 Cabal.FreeBSD -> return "freebsd-aarch64" + Platform arch os -> throwM $ UnsupportedSetupCombo os arch + + downloadOrUseLocal