git: 60acf80710f3 - 2022Q2 - devel/tbb: Fix symlink creation during build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 23 May 2022 10:13:24 UTC
The branch 2022Q2 has been updated by martymac:
URL: https://cgit.FreeBSD.org/ports/commit/?id=60acf80710f375941e4a7598858a5e97a97728d9
commit 60acf80710f375941e4a7598858a5e97a97728d9
Author: Sean Champ <lab+bsd@thinkum.space>
AuthorDate: 2022-05-12 10:33:23 +0000
Commit: Ganael LAPLANCHE <martymac@FreeBSD.org>
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 <lab+bsd@thinkum.space>
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 <bsd.port.pre.mk>
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: