From nobody Mon May 23 10:13:24 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 C48F81B37576; Mon, 23 May 2022 10:13:24 +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 4L6CpD54wjz3FQ8; Mon, 23 May 2022 10:13:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653300804; 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=WpCibq9uSnEPWV+3slq0kKtntEjg2xK54UZnubv4u2E=; b=kUDCZ0nY5rqGJMl4XkrRM9gH9sExCWEAmPuBoUwViqGS5wAlyACY6R+vzlgLOiD4fw/I/B oVhPK2f+jk6Fx1GZU62dOCdREVU+J0Ln1L2gj/+J2x+3OPvaBdPNWvjt0ktV00XarWaI0c OX72VkX3lzUJbAqC529ygE8zKP+u7uCjrNvIRqQhVi19pvRJzxqC7rT4XzY30V12e5SrQO OCmfMEy9dNeM5Pe4KJ9jytXa3pOQUiYo90vh+LhC3YZ1sPRFO49O/us+ShX9nyg1lmg773 sKl9wkiyX1YpbrIboIdzeI17n5qpUd10Odi8LG5lWBakkqyCQXrZnvvmqiqSHw== 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 8E3FD5D30; Mon, 23 May 2022 10:13:24 +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 24NADOYV023631; Mon, 23 May 2022 10:13:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24NADOSY023630; Mon, 23 May 2022 10:13:24 GMT (envelope-from git) Date: Mon, 23 May 2022 10:13:24 GMT Message-Id: <202205231013.24NADOSY023630@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Ganael LAPLANCHE Subject: git: 60acf80710f3 - 2022Q2 - devel/tbb: Fix symlink creation during build 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: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: 60acf80710f375941e4a7598858a5e97a97728d9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653300804; 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=WpCibq9uSnEPWV+3slq0kKtntEjg2xK54UZnubv4u2E=; b=nnCnJTxb/8JBoypoB0ZS0B3xzgSky3tak6cs61aym1HKNSOjnpvbN1mDFzk3lEz+Zyod8Z tvifekydrAPqDy2PHynw4WQ/DPwsD3enYARdvJed5ObvATBvNHOGUvPQeX4TaikmIWq5df BFO3Vc4RcV7DWr5RkEvoOQ1Rp+PjEDEVd9NHApEgVdZXrq5PQjs/qp9Qx86+Lq8xHFSINm IOBspMS4qDIgowlFZ7zDIi54VkaQJa1c0IVHI9yCbi9HQuV7/ieoMUkl8qphac8JT1EbkM RDwp4QsGbsEu9EhJKUe4elf5Kc/E3al4+MHlrDUd3TbE4X/fthDswaV5Lg1Mvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653300804; a=rsa-sha256; cv=none; b=A+CqrQ4NN7AXxXERJaWfjxcxhsDhKIw4UMG+I7beDJehdVHFMlJMA0DwG43y7nMyz0xTVT BQudRDhsKuQZSj6KAROxjVgWdL5/N6Yt+O8ZuEU/hrKRQzXjaXPgApmCtBwHrTRJLzVN1v t0/L22sz7Moa2UnB7MCZO5NyBad0MetwXQcu71tspdaTwO620pjl6/kEgRJWCJvdvPZFRL LFogFOXlmcE1n6qHFuGkry5I8JueyGkLzDASvjqDI9lvRcZT6IClr8H/zbnwhj5hN6RX/u GbUMKVIuNKoSb7pl0MH3aUaf962j1qSQwgQX92LXKX9ctRtlYdLLt7VReVln8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=60acf80710f375941e4a7598858a5e97a97728d9 commit 60acf80710f375941e4a7598858a5e97a97728d9 Author: Sean Champ AuthorDate: 2022-05-12 10:33:23 +0000 Commit: Ganael LAPLANCHE CommitDate: 2022-05-23 10:12:44 +0000 devel/tbb: Fix symlink creation during build Temporary variable CC_BASENAME may not reflect actual COMPILER_TYPE on environments that modify CC or COMPILER_TYPE through included files, leading to creating a wrong symlink. Evaluating CC in the post-extract target ensures it is up to date and in line with COMPILER_TYPE. PR: 263851 Reported by: Sean Champ MFH: 2022Q2 (cherry picked from commit b5e26678495d795d8596874e19790076e09c1c91) --- devel/tbb/Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/devel/tbb/Makefile b/devel/tbb/Makefile index 990317db3009..31403f36d786 100644 --- a/devel/tbb/Makefile +++ b/devel/tbb/Makefile @@ -37,14 +37,13 @@ DOCS_BUILD_DEPENDS= doxygen:devel/doxygen \ USE_LDCONFIG= yes ALL_TARGET= default -CC_BASENAME= ${CC:C,^.*/,,} - .include post-extract: -.if ${CC_BASENAME} != ${COMPILER_TYPE} - @${LN} -sf FreeBSD.${COMPILER_TYPE}.inc ${WRKSRC}/build/FreeBSD.${CC_BASENAME}.inc -.endif + @if [ "${COMPILER_TYPE}" != "${CC:T}" ]; then \ + ${LN} -sf FreeBSD.${COMPILER_TYPE}.inc \ + ${WRKSRC}/build/FreeBSD.${CC:T}.inc; \ + fi @${CP} ${FILESDIR}/version_info_FreeBSD.sh ${WRKSRC}/build/ post-patch: