From nobody Mon May 30 20:09:16 2022 X-Original-To: dev-commits-ports-all@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 64E4D1B5F62A; Mon, 30 May 2022 20:09:16 +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 4LBmhX2LYQz3mJr; Mon, 30 May 2022 20:09:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653941356; 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=yzL0LeFTVacxO8d6kAQ4yREveqhoOxP1FqzzUCvh/TA=; b=j0ITjfQU4ODc4geBlQWA5jRiL6nSTMZGM7lI4AfJVPZWQnyXtVuZr9blHw2bQNlEHZYDHG kOq4jd0LzXPY2alY0ObeAyfTbLuIoXgRU1Y+AKTUugRVninRPJvlvWZ5PgYSP5fLgsaPD/ VYW+uBebUCs1iXK/yOR3n1QHicpbdbr9YNSKiY8wul4WdA3RL2RL30sd1+baBZCQqNI9+g 4AGA2w+sSgg6TL40Zc07jdr7id7oCL/hj8zPwbEjv5mohUXfIZz4Y4p4CK2hTeSNutDGe0 7q7r04NuI9fGeXMzaY+yooHxyWxRsWhW7WNRN3WHaGre5Mxgtsc7eA8k0sGcxQ== 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 2C2051DBA1; Mon, 30 May 2022 20:09:16 +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 24UK9GBs011233; Mon, 30 May 2022 20:09:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24UK9GBX011232; Mon, 30 May 2022 20:09:16 GMT (envelope-from git) Date: Mon, 30 May 2022 20:09:16 GMT Message-Id: <202205302009.24UK9GBX011232@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: afdc95c40d4f - main - lang/ghc: Properly dereference a shell variable. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: afdc95c40d4f1fb2625f945fc70ecc558d56e6ca Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653941356; 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=yzL0LeFTVacxO8d6kAQ4yREveqhoOxP1FqzzUCvh/TA=; b=VaHXaLwfcSrxJzuXefAMxYOo9+xrxaSs4st5SGKVmzrYNTSSkccPlLNdRVGBqZoyGF0k3g 0PoM+AbCMV5DdEOLN7UHD84KNNTZQAUGcE07c1yIB8LS/8UQ/GXhh/TizxUd3Z4YBVXJm8 eZ6cp4ePubcx4cDTVN7zgLLO9L0HtfCJXs9LWbO15mdwcQn2a5cHbbuwayKdvGWtyQMGlE 7yUNTcjKlXn9QIlT0i0CNFL3Dl67UvBVQBkQyekxxC5ep8kooTLj+6yvdtbFx/iMLbkWP8 0UaMwaEmmdrRLm2nBlDXE4nLDVEi14a2pxLpZuWIBRNeOWY6Z77esYw3ICa/Rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653941356; a=rsa-sha256; cv=none; b=XFKPFVHu1oNMaG/tQJQ0XE89gvFDsq7lu3klUQ/io4B+GrCOPVpRi+/r8SypoDdyuJWskO jBPPIfznOPLXjB5hWtXDf+Bn1XPWTAH5A+lA9NrqHVaA0PZv+gC3XSmpFpuwRsjW7rVitC DgWyCGScRRkQqRQjwDZmjRL51mM13GlQFjcozkqNBPbQghyjA/yIX2MNun4WYxc70b2zwU xH6aAehgkrslm+sJTlDlWlNOQ/H90qNChGwgurtUyjNcomXhmxnQczcaI9G8Bi9qHB7co3 348cS3r/TCkaELG7vTxp2VdV2JXSEpLfsG8bxsmiEVNv5N7atJkZ6ABcUrDzQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=afdc95c40d4f1fb2625f945fc70ecc558d56e6ca commit afdc95c40d4f1fb2625f945fc70ecc558d56e6ca Author: Mark Millard AuthorDate: 2022-05-30 20:05:34 +0000 Commit: Gleb Popov CommitDate: 2022-05-30 20:08:35 +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 --- 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}}}'`