From nobody Mon May 30 20:14:08 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 B21A61B405A1; Mon, 30 May 2022 20:14:08 +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 4LBmp84cTwz3mcr; Mon, 30 May 2022 20:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653941648; 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=/FjAjiJTa+a2klPaAPfsxg6h64CRfI+qYw8qOVRHuPk=; b=x/BVSTpWp1R6T9K/NowDfJjXqS+JcMpY6WpSlB7LZ6zIIqpQQufehluXIL6mmcp1sXHJ7Q +BKEvitAn2lVHbwAT8IVOHUW8P5l4hkkJ7rbxXDqgUWunHykeyzNvhIji3089QrqywzIq9 MH5gvTsftHfoTLdFkhKuOSvqsNGvXE36yPvO/wSPfzpkuX+jeF2cZd2XzFrJraMpQdNwgJ jdbvRoVi0mZ3RoeaeJ5fPDI8bDFk6v89M/S8/SClcZ3ZmN7MQQJaC84rk9441ctgXfyBSc 7b5soMpXoe4pumW+tYX1klYpRnmkhnniE5UyJK3UXeh5VcWGvGm2GaYd1TqOLA== 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 7EE361DDCB; Mon, 30 May 2022 20:14:08 +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 24UKE8Yt024179; Mon, 30 May 2022 20:14:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24UKE8G1024178; Mon, 30 May 2022 20:14:08 GMT (envelope-from git) Date: Mon, 30 May 2022 20:14:08 GMT Message-Id: <202205302014.24UKE8G1024178@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: 39e8ccaa0654 - 2022Q2 - lang/ghc: Properly dereference a shell variable. 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/2022Q2 X-Git-Reftype: branch X-Git-Commit: 39e8ccaa065430d6e8ee3baa46c6772f0e02f899 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653941648; 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=/FjAjiJTa+a2klPaAPfsxg6h64CRfI+qYw8qOVRHuPk=; b=FMcYBOXMJ2FWR7Ogqj2PVMptRsRkpBWTpaM3ixqjuMGJlUYOROMK7BOhmGfCEMc8tdw/zz w3HR0x/UqCODC+iy4WkQuUVK/llczVyq3RxICnUrcOTOHKBrbGh7xqS76VzeXPuTWMQQmK aqSrG8KFSFAtO7PX0ZIrkj4a80Qp4RkbePp93QgsRivGJ2j8VcoxA15mA089VAOGyjj7pY 0M4S60rMRrVEMdhzmXX/gkw3i9Ut6xNzd3npph3M/W+BVucdviZIbcTek1ueduAefSaZpH 4ujHvj3qXCB2u0KRlQH0Rh1J0+1cgOHAXpuRc8Q7liaZewyk0Vtda0TXDAUA3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653941648; a=rsa-sha256; cv=none; b=KTZXsxOzest1S6VqVF2evoT2V2PQuOtzzzCHaxRGAvepfe1olVMRZrcrPePGuGXGJN+FKM n8nF8izN1lCXUImgr4XA+1ce1Igw/GMHDoeJW4sKs4Gkxd/TsqfOKnRy/LYNued+Pvx4aD OXjmU1x74fOQVNGoknnPN+36ddyPbn7iivsz93t7CX36azlTvyxN6MNofMmnkW0gwwTm9s BTpyjb3aWiRqdZnPZfXg3rBNVVSaYQWCBm4XdJ2TtDdwLvcgSsM6tHoJJyN3eivJOlohUz ihIo9PBol1UV6gDlT9ASgsQq8VT8Dond3u6+fd3gb8EoEzSplbawPm0N0Y15hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=39e8ccaa065430d6e8ee3baa46c6772f0e02f899 commit 39e8ccaa065430d6e8ee3baa46c6772f0e02f899 Author: Mark Millard AuthorDate: 2022-05-30 20:05:34 +0000 Commit: Gleb Popov CommitDate: 2022-05-30 20:13:42 +0000 lang/ghc: Properly dereference a shell variable. This makes GHC build system to pick up correct LLVM tools during the build on ARM. PR: 264192 (cherry picked from commit afdc95c40d4f1fb2625f945fc70ecc558d56e6ca) --- lang/ghc/files/patch-aclocal.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/ghc/files/patch-aclocal.m4 b/lang/ghc/files/patch-aclocal.m4 index 2eb04c157343..dc83f27a23d7 100644 --- a/lang/ghc/files/patch-aclocal.m4 +++ b/lang/ghc/files/patch-aclocal.m4 @@ -14,7 +14,7 @@ AC_DEFUN([FIND_LLVM_PROG],[ # Test for program with and without version name. - PROG_VERSION_CANDIDATES=$(for llvmVersion in `seq $4 -1 $3`; do echo "$2-$llvmVersion $2-$llvmVersion.0"; done) -+ PROG_VERSION_CANDIDATES=$(for llvmVersion in `seq $4 -1 $3`; do echo "$2-$llvmVersion $2-$llvmVersion.0 $2$llvmVersion $2$llvmVersion0"; done) ++ PROG_VERSION_CANDIDATES=$(for llvmVersion in `seq $4 -1 $3`; do echo "$2-$llvmVersion $2-$llvmVersion.0 $2$llvmVersion $2${llvmVersion}0"; done) AC_CHECK_TOOLS([$1], [$PROG_VERSION_CANDIDATES $2], []) AS_IF([test x"$$1" != x],[ PROG_VERSION=`$$1 --version | awk '/.*version [[0-9\.]]+/{for(i=1;i<=NF;i++){ if(\$i ~ /^[[0-9\.]]+$/){print \$i}}}'`