From owner-dev-commits-ports-all@freebsd.org Mon Sep 27 22:24:14 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 66D546714CB; Mon, 27 Sep 2021 22:24: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 4HJHHL2NrNz4tgp; Mon, 27 Sep 2021 22:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 334D7193CE; Mon, 27 Sep 2021 22:24: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 18RMOER0056620; Mon, 27 Sep 2021 22:24:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18RMOEqK056619; Mon, 27 Sep 2021 22:24:14 GMT (envelope-from git) Date: Mon, 27 Sep 2021 22:24:14 GMT Message-Id: <202109272224.18RMOEqK056619@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: 6911dd4091d5 - main - devel/llvm*: avoid crossdir links MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6911dd4091d50c0ea29a40e2366f38db0f775c37 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Sep 2021 22:24:14 -0000 The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=6911dd4091d50c0ea29a40e2366f38db0f775c37 commit 6911dd4091d50c0ea29a40e2366f38db0f775c37 Author: Brooks Davis AuthorDate: 2021-09-27 22:23:57 +0000 Commit: Brooks Davis CommitDate: 2021-09-27 22:23:57 +0000 devel/llvm*: avoid crossdir links Avoid hardlinks between PREFIX/bin and PREFIX/llvm##. This permits them be on different filesystems. PR: 244439 --- devel/llvm10/Makefile | 19 ++++++++++--------- devel/llvm11/Makefile | 21 +++++++++++---------- devel/llvm12/Makefile | 21 +++++++++++---------- devel/llvm70/Makefile | 17 +++++++++-------- devel/llvm80/Makefile | 19 ++++++++++--------- devel/llvm90/Makefile | 17 +++++++++-------- 6 files changed, 60 insertions(+), 54 deletions(-) diff --git a/devel/llvm10/Makefile b/devel/llvm10/Makefile index 680d653a8acc..eece54aaa40a 100644 --- a/devel/llvm10/Makefile +++ b/devel/llvm10/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 10.0.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} @@ -24,7 +24,8 @@ LLVM_SUFFIX= ${LLVM_MAJOR} PRE_= ${DISTVERSION:C/.*rc.*/pre/:N*[0-9]*} RCDIR= ${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|\1/|} -LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} +LLVM_DIR= llvm${LLVM_SUFFIX} +LLVM_PREFIX= ${PREFIX}/${LLVM_DIR} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} @@ -93,7 +94,7 @@ BE_NATIVE_DESC= Backend(s) for this architecture (${_NATIVE_BACKENDS}) BE_NATIVE_CMAKE_ON= -DLLVM_TARGETS_TO_BUILD="${NATIVE_BACKENDS:ts;}" BE_STANDARD_DESC= All non-experimental backends .for BE in FREEBSD NATIVE STANDARD -BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_PREFIX:S|${PREFIX}/||}/lib/libLLVM|} +BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_DIR}/lib/libLLVM|} .endfor CLANG_DESC= Build clang CLANG_EXTRA_PATCHES= ${PATCHDIR}/clang @@ -356,8 +357,8 @@ _BE_LIBS_${BE}+= ${_BE_LIBS_COMMON:S/^/${BE_ARCH}/} \ .endfor BE_PATTERN=${_BE_LIBS_STANDARD:O:S/$/.a/:ts|} -_CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd -_CRTBLDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/share +_CRTLIBDIR= ${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/lib/freebsd +_CRTBLDIR= ${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/share _COMPILER_RT_BLACKLISTS= cfi_blacklist.txt .if ${ARCH} == "amd64" _COMPILER_RT_BLACKLISTS+= asan_blacklist.txt @@ -554,9 +555,9 @@ post-install-LIT-on: ${STAGEDIR}${LLVM_PREFIX}/bin/lit ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ + ${LN} -fs ../${LLVM_DIR}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX} - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ + ${LN} -fs ../${LLVM_DIR}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX} ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands @@ -569,7 +570,7 @@ post-install-LIT-on: ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \ ${STAGEDIR}${LLVM_PREFIX}/bin/ - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \ + ${LN} -fs ../${LLVM_DIR}/bin/FileCheck \ ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX} post-install-LLD-on: @@ -593,7 +594,7 @@ build-plist: .endfor .for command in ${LIT_COMMANDS} ${ECHO_CMD} %%LIT%%bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp - ${ECHO_CMD} %%LIT%%${LLVM_PREFIX:S|${PREFIX}/||:C|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp + ${ECHO_CMD} %%LIT%%${LLVM_DIR:C|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp .endfor ${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \ diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile index dff6ccd91f04..2279478fb63e 100644 --- a/devel/llvm11/Makefile +++ b/devel/llvm11/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 11.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} @@ -24,7 +24,8 @@ LLVM_SUFFIX= ${LLVM_MAJOR} PRE_= ${DISTVERSION:C/.*rc.*/pre/:N*[0-9]*} RCDIR= ${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|\1/|} -LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} +LLVM_DIR= llvm${LLVM_SUFFIX} +LLVM_PREFIX= ${PREFIX}/${LLVM_DIR} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} @@ -89,7 +90,7 @@ BE_NATIVE_DESC= Backend(s) for this architecture (${_NATIVE_BACKENDS}) BE_NATIVE_CMAKE_ON= -DLLVM_TARGETS_TO_BUILD="${NATIVE_BACKENDS:ts;}" BE_STANDARD_DESC= All non-experimental backends .for BE in FREEBSD NATIVE STANDARD -BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_PREFIX:S|${PREFIX}/||}/lib/libLLVM|} +BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_DIR}/lib/libLLVM|} .endfor CLANG_DESC= Build clang CLANG_EXTRA_PATCHES= ${PATCHDIR}/clang @@ -271,7 +272,7 @@ COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/fuzzer|profile\/InstrProfD COMMANDS+= ${EXTRAS_COMMANDS} MAN1SRCS+= extraclangtools.1 PORTDOCS+= clang-tools -PLIST_DIRS+= ${LLVM_PREFIX:S|${PREFIX}/||}/include/clang-tidy/plugin +PLIST_DIRS+= ${LLVM_DIR}/include/clang-tidy/plugin SHEBANG_FILES+= tools/clang/tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py \ tools/clang/tools/extra/clang-tidy/tool/clang-tidy-diff.py \ tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py @@ -350,8 +351,8 @@ _BE_LIBS_${BE}+= ${_BE_LIBS_COMMON:S/^/${BE_ARCH}/} \ .endfor BE_PATTERN=${_BE_LIBS_STANDARD:O:S/$/.a/:ts|} -_CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd -_CRTBLDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/share +_CRTLIBDIR= ${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/lib/freebsd +_CRTBLDIR= ${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/share _COMPILER_RT_BLACKLISTS= cfi_blacklist.txt .if ${ARCH} == "amd64" _COMPILER_RT_BLACKLISTS+= asan_blacklist.txt @@ -548,9 +549,9 @@ post-install-LIT-on: ${STAGEDIR}${LLVM_PREFIX}/bin/lit ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ + ${LN} -fs ../${LLVM_DIR}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX} - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ + ${LN} -fs ../${LLVM_DIR}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX} ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands @@ -563,7 +564,7 @@ post-install-LIT-on: ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \ ${STAGEDIR}${LLVM_PREFIX}/bin/ - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \ + ${LN} -fs ../${LLVM_DIR}/bin/FileCheck \ ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX} post-install-LLD-on: @@ -587,7 +588,7 @@ build-plist: .endfor .for command in ${LIT_COMMANDS} ${ECHO_CMD} %%LIT%%bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp - ${ECHO_CMD} %%LIT%%${LLVM_PREFIX:S|${PREFIX}/||:C|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp + ${ECHO_CMD} %%LIT%%${LLVM_DIR:C|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp .endfor ${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \ diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile index feb1958d2447..86f94ffc5e0e 100644 --- a/devel/llvm12/Makefile +++ b/devel/llvm12/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 12.0.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} @@ -25,7 +25,8 @@ LLVM_SUFFIX= ${LLVM_MAJOR} PRE_= ${DISTVERSION:C/.*rc.*/pre/:N*[0-9]*} RCDIR= ${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|\1/|} -LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} +LLVM_DIR= llvm${LLVM_SUFFIX} +LLVM_PREFIX= ${PREFIX}/${LLVM_DIR} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} @@ -103,7 +104,7 @@ BE_NATIVE_DESC= Backend(s) for this architecture (${_NATIVE_BACKENDS}) BE_NATIVE_CMAKE_ON= -DLLVM_TARGETS_TO_BUILD="${NATIVE_BACKENDS:ts;}" BE_STANDARD_DESC= All non-experimental backends .for BE in FREEBSD NATIVE STANDARD -BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_PREFIX:S|${PREFIX}/||}/lib/libLLVM|} +BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_DIR}/lib/libLLVM|} .endfor CLANG_DESC= Build clang CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp @@ -281,7 +282,7 @@ LLVM_ENABLE_PROJECTS+= clang-tools-extra COMMANDS+= ${EXTRAS_COMMANDS} MAN1SRCS+= extraclangtools.1 PORTDOCS+= clang-tools -PLIST_DIRS+= ${LLVM_PREFIX:S|${PREFIX}/||}/include/clang-tidy/plugin +PLIST_DIRS+= ${LLVM_DIR}/include/clang-tidy/plugin .endif .if ${PORT_OPTIONS:MLIT} @@ -365,8 +366,8 @@ _BE_LIBS_${BE}+= ${_BE_LIBS_COMMON:S/^/${BE_ARCH}/} \ .endfor BE_PATTERN=${_BE_LIBS_STANDARD:O:S/$/.a/:ts|} -_CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd -_CRTBLDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/share +_CRTLIBDIR= ${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/lib/freebsd +_CRTBLDIR= ${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/share _COMPILER_RT_BLACKLISTS= cfi_blacklist.txt _COMPILER_RT_LIBS_i386= \ libclang_rt.asan-i386.a \ @@ -523,9 +524,9 @@ post-install-LIT-on: ${STAGEDIR}${LLVM_PREFIX}/bin/lit ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ + ${LN} -fs ../${LLVM_DIR}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX} - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ + ${LN} -fs ../${LLVM_DIR}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX} ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands @@ -538,7 +539,7 @@ post-install-LIT-on: ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \ ${STAGEDIR}${LLVM_PREFIX}/bin/ - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \ + ${LN} -fs ../${LLVM_DIR}/bin/FileCheck \ ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX} post-install-LLD-on: @@ -562,7 +563,7 @@ build-plist: .endfor .for command in ${LIT_COMMANDS} ${ECHO_CMD} %%LIT%%bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp - ${ECHO_CMD} %%LIT%%${LLVM_PREFIX:S|${PREFIX}/||:C|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp + ${ECHO_CMD} %%LIT%%${LLVM_DIR:C|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp .endfor ${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \ diff --git a/devel/llvm70/Makefile b/devel/llvm70/Makefile index a7459d8fc2e6..6c9a425f441f 100644 --- a/devel/llvm70/Makefile +++ b/devel/llvm70/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 7.0.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel lang MASTER_SITES= http://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -18,7 +18,8 @@ RCDIR= ${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|\1/|} PRE_= ${DISTVERSION:C/.*rc.*/pre/:N*[0-9]*} LLVM_SUFFIX= ${LLVM_RELEASE:C/\.[0-9]$//:C/\.//} -LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} +LLVM_DIR= llvm${LLVM_SUFFIX} +LLVM_PREFIX= ${PREFIX}/${LLVM_DIR} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} @@ -201,8 +202,8 @@ MAN1SRCS+= bugpoint.1 dsymutil.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \ LDFLAGS_armv6=-fuse-ld=lld .endif -_CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd -_CRTBLDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/share +_CRTLIBDIR= ${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/lib/freebsd +_CRTBLDIR= ${LLVM_DIR}/share _COMPILER_RT_BLACKLISTS= cfi_blacklist.txt .if ${ARCH} == "amd64" _COMPILER_RT_BLACKLISTS+= asan_blacklist.txt @@ -384,9 +385,9 @@ post-install-LIT-on: ${STAGEDIR}${LLVM_PREFIX}/bin/lit ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ + ${LN} -fs ../${LLVM_DIR}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX} - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ + ${LN} -fs ../${LLVM_DIR}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX} ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands @@ -399,7 +400,7 @@ post-install-LIT-on: ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \ ${STAGEDIR}${LLVM_PREFIX}/bin/ - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \ + ${LN} -fs ../${LLVM_DIR}/bin/FileCheck \ ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX} TEST_CMD= '(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)' @@ -420,7 +421,7 @@ build-plist: .endfor .for command in ${LIT_COMMANDS} ${ECHO_CMD} %%LIT%%bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp - ${ECHO_CMD} %%LIT%%${LLVM_PREFIX:S|${PREFIX}/||:C|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp + ${ECHO_CMD} %%LIT%%${LLVM_DIR:C|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp .endfor ${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \ diff --git a/devel/llvm80/Makefile b/devel/llvm80/Makefile index 5aea304d7801..a4dff03c7499 100644 --- a/devel/llvm80/Makefile +++ b/devel/llvm80/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 8.0.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION}/ PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -16,7 +16,8 @@ LLVM_RELEASE= ${DISTVERSION:C/rc.*//} LLVM_MAJOR= ${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//} LLVM_SUFFIX= ${LLVM_RELEASE:C/\.[0-9]$//:C/\.//} -LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} +LLVM_DIR= llvm${LLVM_SUFFIX} +LLVM_PREFIX= ${PREFIX}/${LLVM_DIR} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} @@ -78,7 +79,7 @@ BE_NATIVE_DESC= Backend(s) for this architecture (${_NATIVE_BACKENDS}) BE_NATIVE_CMAKE_ON= -DLLVM_TARGETS_TO_BUILD="${NATIVE_BACKENDS:ts;}" BE_STANDARD_DESC= All non-experimental backends .for BE in FREEBSD NATIVE STANDARD -BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_PREFIX:S|${PREFIX}/||}/lib/libLLVM|} +BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_DIR}/lib/libLLVM|} .endfor CLANG_DESC= Build clang CLANG_EXTRA_PATCHES= ${PATCHDIR}/clang @@ -293,8 +294,8 @@ _BE_LIBS_${BE}+= ${_BE_LIBS_COMMON:S/^/${BE_ARCH}/} \ .endfor BE_PATTERN=${_BE_LIBS_STANDARD:O:S/$/.a/:ts|} -_CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd -_CRTBLDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/share +_CRTLIBDIR= ${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/lib/freebsd +_CRTBLDIR= ${LLVM_DIR}/share _COMPILER_RT_BLACKLISTS= cfi_blacklist.txt .if ${ARCH} == "amd64" _COMPILER_RT_BLACKLISTS+= asan_blacklist.txt @@ -492,9 +493,9 @@ post-install-LIT-on: ${STAGEDIR}${LLVM_PREFIX}/bin/lit ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ + ${LN} -fs ../${LLVM_DIR}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX} - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ + ${LN} -fs ../${LLVM_DIR}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX} ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands @@ -507,7 +508,7 @@ post-install-LIT-on: ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \ ${STAGEDIR}${LLVM_PREFIX}/bin/ - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \ + ${LN} -fs ../${LLVM_DIR}/bin/FileCheck \ ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX} TEST_CMD= '(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)' @@ -528,7 +529,7 @@ build-plist: .endfor .for command in ${LIT_COMMANDS} ${ECHO_CMD} %%LIT%%bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp - ${ECHO_CMD} %%LIT%%${LLVM_PREFIX:S|${PREFIX}/||:C|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp + ${ECHO_CMD} %%LIT%%${LLVM_DIR:C|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp .endfor ${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \ diff --git a/devel/llvm90/Makefile b/devel/llvm90/Makefile index 5cfe0d098469..b265c5bdfeda 100644 --- a/devel/llvm90/Makefile +++ b/devel/llvm90/Makefile @@ -22,7 +22,8 @@ LLVM_MAJOR= ${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//} LLVM_SUFFIX= ${LLVM_RELEASE:C/\.[0-9]$//:C/\.//} RCDIR= ${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|\1/|} -LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} +LLVM_DIR= llvm${LLVM_SUFFIX} +LLVM_PREFIX= ${PREFIX}/${LLVM_DIR} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} @@ -85,7 +86,7 @@ BE_NATIVE_DESC= Backend(s) for this architecture (${_NATIVE_BACKENDS}) BE_NATIVE_CMAKE_ON= -DLLVM_TARGETS_TO_BUILD="${NATIVE_BACKENDS:ts;}" BE_STANDARD_DESC= All non-experimental backends .for BE in FREEBSD NATIVE STANDARD -BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_PREFIX:S|${PREFIX}/||}/lib/libLLVM|} +BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_DIR}/lib/libLLVM|} .endfor CLANG_DESC= Build clang CLANG_EXTRA_PATCHES= ${PATCHDIR}/clang @@ -329,8 +330,8 @@ _BE_LIBS_${BE}+= ${_BE_LIBS_COMMON:S/^/${BE_ARCH}/} \ .endfor BE_PATTERN=${_BE_LIBS_STANDARD:O:S/$/.a/:ts|} -_CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd -_CRTBLDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/share +_CRTLIBDIR= ${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/lib/freebsd +_CRTBLDIR= ${LLVM_DIR}/share _COMPILER_RT_BLACKLISTS= cfi_blacklist.txt .if ${ARCH} == "amd64" _COMPILER_RT_BLACKLISTS+= asan_blacklist.txt @@ -520,9 +521,9 @@ post-install-LIT-on: ${STAGEDIR}${LLVM_PREFIX}/bin/lit ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ + ${LN} -fs ../${LLVM_DIR}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX} - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ + ${LN} -fs ../${LLVM_DIR}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX} ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands @@ -535,7 +536,7 @@ post-install-LIT-on: ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \ ${STAGEDIR}${LLVM_PREFIX}/bin/ - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \ + ${LN} -fs ../${LLVM_DIR}/bin/FileCheck \ ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX} post-install-LLD_LINK-on: @@ -559,7 +560,7 @@ build-plist: .endfor .for command in ${LIT_COMMANDS} ${ECHO_CMD} %%LIT%%bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp - ${ECHO_CMD} %%LIT%%${LLVM_PREFIX:S|${PREFIX}/||:C|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp + ${ECHO_CMD} %%LIT%%${LLVM_DIR:C|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp .endfor ${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \