From nobody Sun Feb 13 18:24:50 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2323819499C9; Sun, 13 Feb 2022 18:24:51 +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 4JxbNz0R0Lz4h5F; Sun, 13 Feb 2022 18:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644776691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k8H8u/0omIbgvAin9dUCmXq5dYdtvdFcRynPkqTG6lk=; b=pkZngA4etMfAfiaf84p5XGwPzjBTjEPzYNm033Lp0HNTg1ZmBmrgXTWM21lidinGesZPfw 2Azsk9jDdQQyYnlqPNJVQl9sIwQzidgEjPORkozUMrQ6/MfuzlsZjJNJ9Yk5A3nExij3SI VvEjso8EsNnoExRDIEYJQAuSbrVHCOQqhwElK5I3/PKhRfvR42W0OPFdGAlIC031ReK6ep dsTmY0jtr2ymZVqU5EUQSkpE7Cq++kXO2l2M8z61xw+6Jmfu7uhbHnDcL/HjA36cXVF26t 1oCB0ZudPxxqxZLnojnTrdfDQ811dxLbukv+XWReU0hQPYltFCjTOZtTsxPQUw== 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 E2D7F200F1; Sun, 13 Feb 2022 18:24:50 +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 21DIOoFe001903; Sun, 13 Feb 2022 18:24:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21DIOokh001902; Sun, 13 Feb 2022 18:24:50 GMT (envelope-from git) Date: Sun, 13 Feb 2022 18:24:50 GMT Message-Id: <202202131824.21DIOokh001902@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Gleb Popov Subject: git: ace7cc4996e7 - 2022Q1 - lang/ghc: Add a patch for correctly selecting a LLVM backend. List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: ace7cc4996e7fd6728f5a421e16ded21c498e30e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644776691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k8H8u/0omIbgvAin9dUCmXq5dYdtvdFcRynPkqTG6lk=; b=h3Wc3m5EHktjeuqeN7N3kHLYxgTCIxTMBEOWOVUwDyjufaGO88iXCRHSpprXjZ3YlKxhqD pEQhv8/+dJEqUZzHgCwX8SpnO7Yz042g1qYj9mq/XZPmnOprzFsyfCN4MinH6b6qkc1Xh/ tkckYDZ18L1hOT9/2LPe4LmLwHmJchQZSsD/Kw9ZX2HNfvvUM0t9/MrmZPRhxbt3gCEMLb 5bP3KZZ7nHkyLfPAuWdJj1L+abTY8SdmBzPLDdnhPI1p2NUvs5I5+uToEOZhDGqIfokuWe gOq2G7yooVpgHhjlHBfqPl7eOgaVTpMeibvTlrFPfB75EixDn66YK8rJUemIqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644776691; a=rsa-sha256; cv=none; b=O/JqIHgPNgX7aAQZSDGSlFEay+71scF3voeZu/7o3zeBg2sUxNaOy9pZrcGYiTGV+9lsGT JB5/gjv0+a633NdQTkoHMr7BJ/vDOzILogJqTMV4z/9OAwHfp5wsDoK0kflWC4mPgvJ5QL /gllPIhBPbj8mJGhTnBbrAjx6//mf+66mcYG1oRKW7GfPk8EkGs8v93UF4WeMnchE+ryox q2BeKpCNnxacfOFiNVeq2N4bju3LF1U49ngtf8DEaNNqpkdPQvUEWW4qDKFIoNKjbPXLjT 1OMhnA17xuUB7bhryoA2F48h+y9SEaoPdc/1tGTFWUPJdL8YUFOcxrudGrasYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=ace7cc4996e7fd6728f5a421e16ded21c498e30e commit ace7cc4996e7fd6728f5a421e16ded21c498e30e Author: Filipe da Silva Santos AuthorDate: 2022-02-13 18:19:38 +0000 Commit: Gleb Popov CommitDate: 2022-02-13 18:24:45 +0000 lang/ghc: Add a patch for correctly selecting a LLVM backend. PR: 261798 MFH: 2022Q1 (cherry picked from commit c7644898c7e173dd486e0a23b07c487d2460dee9) --- lang/ghc/Makefile | 1 + lang/ghc/files/patch-llvm-targets | 11 +++++++++++ lang/ghc/files/patch-utils_llvm-targets_gen-data-layout.sh | 11 +++++++++++ 3 files changed, 23 insertions(+) diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 6d2f987eee0d..54fcd2a8ef3d 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -2,6 +2,7 @@ PORTNAME= ghc PORTVERSION= ${GHC_VERSION} +PORTREVISION= 1 CATEGORIES= lang haskell MASTER_SITES= https://www.haskell.org/ghc/dist/${PORTVERSION}/:source \ LOCAL/arrowd/:boot \ diff --git a/lang/ghc/files/patch-llvm-targets b/lang/ghc/files/patch-llvm-targets new file mode 100644 index 000000000000..7e46cd9c46e5 --- /dev/null +++ b/lang/ghc/files/patch-llvm-targets @@ -0,0 +1,11 @@ +--- llvm-targets.orig 2022-02-08 06:25:29 UTC ++++ llvm-targets +@@ -42,7 +42,7 @@ + ,("aarch64-apple-ios", ("e-m:o-i64:64-i128:128-n32:64-S128", "apple-a7", "+fp-armv8 +neon +crypto +zcm +zcz +sha2 +aes")) + ,("i386-apple-ios", ("e-m:o-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-f80:128-n8:16:32-S128", "yonah", "")) + ,("x86_64-apple-ios", ("e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", "core2", "")) +-,("amd64-portbld-freebsd", ("e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", "x86-64", "")) ++,("x86_64-portbld-freebsd", ("e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", "x86-64", "")) + ,("x86_64-unknown-freebsd", ("e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", "x86-64", "")) + ,("aarch64-unknown-freebsd", ("e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", "generic", "+neon")) + ,("armv6-unknown-freebsd-gnueabihf", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s", "+strict-align")) diff --git a/lang/ghc/files/patch-utils_llvm-targets_gen-data-layout.sh b/lang/ghc/files/patch-utils_llvm-targets_gen-data-layout.sh new file mode 100644 index 000000000000..7c5cddbd2bbd --- /dev/null +++ b/lang/ghc/files/patch-utils_llvm-targets_gen-data-layout.sh @@ -0,0 +1,11 @@ +--- utils/llvm-targets/gen-data-layout.sh.orig 2022-02-08 06:25:08 UTC ++++ utils/llvm-targets/gen-data-layout.sh +@@ -93,7 +93,7 @@ TARGETS=( + ######################### + + # FreeBSD amd64 +- "amd64-portbld-freebsd" ++ "x86_64-portbld-freebsd" + "x86_64-unknown-freebsd" # See #15718 + + # FreeBSD ARM