Date: Tue, 24 Aug 2021 17:45:25 GMT From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 088b99d471a5 - main - devel/llvm-devel: fix build without OPENMP Message-ID: <202108241745.17OHjPbr068288@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=088b99d471a50a5cf041fa18a8cd21a63ed98ebf commit 088b99d471a50a5cf041fa18a8cd21a63ed98ebf Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2021-08-24 17:44:55 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2021-08-24 17:44:55 +0000 devel/llvm-devel: fix build without OPENMP Some files were not correctly tagged as being part of the OpenMP build.[0] Fix symlinks to lit and FileCheck. They improperly included STAGEDIR.[1] PR: 257947 [0], 244439 [1] Sponsored by: DARPA --- devel/llvm-devel/Makefile | 32 +++++++++++++++++--------------- devel/llvm-devel/Makefile.COMMANDS | 4 +++- devel/llvm-devel/pkg-plist | 6 +++--- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 543f612220a2..0c0cb4383f0d 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -22,7 +22,8 @@ FLAVOR?= ${FLAVORS:[1]} lite_PKGNAMESUFFIX= ${LLVM_SUFFIX}-lite LLVM_SUFFIX= -devel -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} @@ -41,12 +42,12 @@ SHEBANG_FILES= \ clang/tools/scan-build-py/libexec/intercept-cc \ clang/tools/scan-build-py/libexec/intercept-c++ \ flang/tools/f18/flang \ - llvm/utils/lit/lit.py \ - llvm/utils/llvm-lit/llvm-lit.in \ llvm/tools/opt-viewer/optrecord.py \ llvm/tools/opt-viewer/opt-diff.py \ llvm/tools/opt-viewer/opt-stats.py \ - llvm/tools/opt-viewer/opt-viewer.py + llvm/tools/opt-viewer/opt-viewer.py \ + llvm/utils/lit/lit.py \ + llvm/utils/llvm-lit/llvm-lit.in SUB_FILES= llvm-wrapper.sh SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}" @@ -101,7 +102,7 @@ OPTIONS_DEFAULT_powerpc64_13= GOLD OPTIONS_DEFAULT_powerpc64_14= GOLD OPTIONS_DEFAULT_powerpc64le= GOLD OPENMP OPTIONS_EXCLUDE_i386= FLANG -OPTIONS_EXCLUDE_powerpc=FLANG +OPTIONS_EXCLUDE_powerpc= FLANG .endif OPTIONS_SUB= yes _ALL_OPTIONS= CLANG COMPILER_RT DOCS EXTRAS FLANG GOLD LIT LLD LLDB MLIR \ @@ -149,11 +150,11 @@ DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ DOCS_PLIST_FILES= ${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|} EXTRAS_DESC= Extra clang tools EXTRAS_IMPLIES= CLANG -EXTRAS_PLIST_DIRS= ${LLVM_PREFIX:S|${PREFIX}/||}/include/clang-tidy/plugin +EXTRAS_PLIST_DIRS= ${LLVM_DIR}/include/clang-tidy/plugin FLANG_DESC= Flang FORTRAN compiler FLANG_IMPLIES= MLIR #FLANG_PORTDOCS= flang -FLANG_PLIST_DIRS= ${LLVM_PREFIX:S|${PREFIX}/||}/include/flang/Config +FLANG_PLIST_DIRS= ${LLVM_DIR}/include/flang/Config # Docs require sphinx-markdown-tables which requires py-markdown > 3.0.1 FLANG_CMAKE_ON= -DFLANG_INCLUDE_DOCS=OFF LIT_DESC= Install lit and FileCheck test tools @@ -331,9 +332,10 @@ COMMANDS+= ${MLIR_COMMANDS} .if ${PORT_OPTIONS:MOPENMP} LLVM_ENABLE_PROJECTS+= openmp -MAN1SRCS+= llvmopenmp.1 +MAN1SRCS+= llvmopenmp.1 +COMMANDS+= ${OPENMP_COMMANDS} .endif -OPENMP_PATTERN= libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|omp-tools.h +OPENMP_PATTERN= ${OPENMP_COMMANDS:tW:C/ */|/g}|cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|omp-tools.h .if defined(LLVM_ENABLE_PROJECTS) CMAKE_ARGS+= -DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}" @@ -347,8 +349,8 @@ CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif -_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_IGNORELISTS= cfi_ignorelist.txt _COMPILER_RT_LIBS_i386= \ libclang_rt.asan-i386.a \ @@ -498,16 +500,16 @@ post-install-LIT-on: ${STAGEDIR}${LLVM_PREFIX}/bin/lit ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit - ${LN} -fs ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ + ${LN} -fs ../${LLVM_DIR}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX} - ${LN} -fs ${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} ${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/*.py \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \ ${STAGEDIR}${LLVM_PREFIX}/bin/ - ${LN} -fs ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \ + ${LN} -fs ../${LLVM_DIR}/bin/FileCheck \ ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX} post-install-LLD-on: @@ -531,7 +533,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}/||}/bin/${command} >> ${PLIST}.tmp + ${ECHO_CMD} %%LIT%%${LLVM_DIR}/bin/${command} >> ${PLIST}.tmp .endfor ${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \ ${GREP} -v '_ignorelist.txt$$' | \ diff --git a/devel/llvm-devel/Makefile.COMMANDS b/devel/llvm-devel/Makefile.COMMANDS index 9a344ea1514b..8b79bd406155 100644 --- a/devel/llvm-devel/Makefile.COMMANDS +++ b/devel/llvm-devel/Makefile.COMMANDS @@ -35,7 +35,6 @@ LLVM_COMMANDS= \ llvm-nm \ llvm-objcopy \ llvm-objdump \ - llvm-omp-device-info \ llvm-opt-report \ llvm-otool \ llvm-pdbutil \ @@ -133,3 +132,6 @@ MLIR_COMMANDS= \ mlir-reduce \ mlir-tblgen \ mlir-translate + +OPENMP_COMMANDS= \ + llvm-omp-device-info diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist index c65d38bb4f3c..b44b954348db 100644 --- a/devel/llvm-devel/pkg-plist +++ b/devel/llvm-devel/pkg-plist @@ -36,7 +36,6 @@ bin/llvm-mt-devel bin/llvm-nm-devel bin/llvm-objcopy-devel bin/llvm-objdump-devel -bin/llvm-omp-device-info-devel bin/llvm-opt-report-devel bin/llvm-otool-devel bin/llvm-pdbutil-devel @@ -117,6 +116,7 @@ bin/split-file-devel %%MLIR%%bin/mlir-reduce-devel %%MLIR%%bin/mlir-tblgen-devel %%MLIR%%bin/mlir-translate-devel +%%OPENMP%%bin/llvm-omp-device-info-devel %%LIT%%bin/FileCheck-devel %%LIT%%llvm-devel/bin/FileCheck %%LIT%%bin/lit-devel @@ -230,7 +230,7 @@ llvm-devel/bin/llvm-mt llvm-devel/bin/llvm-nm llvm-devel/bin/llvm-objcopy llvm-devel/bin/llvm-objdump -llvm-devel/bin/llvm-omp-device-info +%%OPENMP%%llvm-devel/bin/llvm-omp-device-info llvm-devel/bin/llvm-opt-report llvm-devel/bin/llvm-otool llvm-devel/bin/llvm-pdbutil @@ -4642,7 +4642,7 @@ llvm-devel/lib/cmake/llvm/VersionFromVCS.cmake %%MLIR%%llvm-devel/lib/cmake/mlir/MLIRDetectPythonEnv.cmake %%MLIR%%llvm-devel/lib/cmake/mlir/MLIRTargets-%%CMAKE_BUILD_TYPE%%.cmake %%MLIR%%llvm-devel/lib/cmake/mlir/MLIRTargets.cmake -llvm-devel/lib/cmake/openmp/FindOpenMPTarget.cmake +%%OPENMP%%llvm-devel/lib/cmake/openmp/FindOpenMPTarget.cmake %%STATIC_LIBS%%%%FLANG%%llvm-devel/lib/libFIROptimizer.a %%STATIC_LIBS%%%%FLANG%%llvm-devel/lib/libFortranCommon.a %%STATIC_LIBS%%%%FLANG%%llvm-devel/lib/libFortranDecimal.a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108241745.17OHjPbr068288>