From nobody Thu May 12 10:38:14 2022 X-Original-To: dev-commits-ports-main@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 6E5E31ADF22D; Thu, 12 May 2022 10:38:14 +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 4KzSsy2bLNz3nDM; Thu, 12 May 2022 10:38:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652351894; 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=IorxGJF8Lxw7KrZ3b3XEn6eMWAamg6UMWwAlVx3NhUY=; b=SjyyKu9R9HXtUGO/O/IY9T0jPrD5xOMFs5Ay/g9rmEuCECnYG6efEudTs8xJd8+L/66ewp qeb0OOXfpv1Ab4a9b7SvrkqEPISw7WjJjeSQOI6kP61D4UkqwpjNnJ8RK/Awr2+L0ZwfA9 I9ro8w1b44gHFOM0oOLPlK8B3CflHNL198/Q9Z8LXuHCqFHiJLXnGvuk58JSA9l3y3Di2z llPsgcuKLh46csh3JPX6uEzc+hOlzElYaAx5x/XD3RgYRZ2X1sesjKyK1q4O7Gq+X2fHp0 4dwNCOMIfh2GjoErJpHLIsomr3/INbta9FZt19Zk+CdoBT6nyFxLh4Jg8MtY9Q== 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 3488D49A1; Thu, 12 May 2022 10:38:14 +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 24CAcETR014593; Thu, 12 May 2022 10:38:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24CAcE6o014592; Thu, 12 May 2022 10:38:14 GMT (envelope-from git) Date: Thu, 12 May 2022 10:38:14 GMT Message-Id: <202205121038.24CAcE6o014592@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: b5e26678495d - main - devel/tbb: Fix symlink creation during build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: b5e26678495d795d8596874e19790076e09c1c91 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652351894; 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=IorxGJF8Lxw7KrZ3b3XEn6eMWAamg6UMWwAlVx3NhUY=; b=bPD5w1009EyLeKSvXTJvbpVgmkCK4Elp1/vIkbUjzko5EgUF/aHm14NIzUHaklSyQj75IS UJyADWUWJ9d7aPSgDSEC4caq7iGdlZkx5N9ftSF78S7ocgVkGJ9vqAks5VETMD7FQ/Af52 vAQ7AW97ww3wVdlOswoAWsAob5/lIjtOwbR5asTo6fFFx4EnVJi33wtwZvisgBtmRTMCHp 4RGVGyYHvyGDus8l7DkyaCmo5WGoHaMnXmIpGiaYbCoqnHqjKGDESgmc+uOAeiAUJea6IP F/6KR7tTVJrVA3KGJqYgWAlYP+tMUKNSyL7OC+80TDlfum845w4hFEqckLKFRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652351894; a=rsa-sha256; cv=none; b=pXugg8Cnj2BPZXKg2Ilwhbk8Dgw3emw2ZfHYE8Ta+z5lDj2ny5JteT5zwCINht/GT7D8G7 8f3hJeeE3UtpLmJUs5uVY3GJo47PbZW3iGtqNftFGCxwJ1p8S3beeraZHdmPcslAWTV5lJ 6FyR8HoX4R/l8eDjoesFy14iuLvPS4sYH5vCIrQSZ6j/zD/HtjqyY0lvm35+kJsqsJ22kS qu3eU5sv5iCImeWSS9Y3oxWl02O1Q6HybhBSNxbvSwSYHqIVgpyHAmLv7SnHvoMP6awdaL lypNoztx0G4DN7Jvk2i/Qa9EUH2C+R2U8wxnrZltKDSWb4yKBtlAKEbDKS8mLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=b5e26678495d795d8596874e19790076e09c1c91 commit b5e26678495d795d8596874e19790076e09c1c91 Author: Sean Champ AuthorDate: 2022-05-12 10:33:23 +0000 Commit: Ganael LAPLANCHE CommitDate: 2022-05-12 10:33:23 +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 --- 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: