Date: Wed, 19 Feb 2020 22:27:58 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526532 - head/devel/llvm10 Message-ID: <202002192227.01JMRwhh078447@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Wed Feb 19 22:27:58 2020 New Revision: 526532 URL: https://svnweb.freebsd.org/changeset/ports/526532 Log: Correct a number of OPENMP plist errors. I'd only half-merged the switch to an OPENMP_PATTERN variable. Reported by: Mark Millard Modified: head/devel/llvm10/Makefile head/devel/llvm10/pkg-plist Modified: head/devel/llvm10/Makefile ============================================================================== --- head/devel/llvm10/Makefile Wed Feb 19 22:04:16 2020 (r526531) +++ head/devel/llvm10/Makefile Wed Feb 19 22:27:58 2020 (r526532) @@ -593,13 +593,13 @@ build-plist: -e 's|\([^0-9]\)${LLVM_MAJOR}\([^0-9]\)|\1%%LLVM_MAJOR%%\2|' \ | ${SORT} >> ${PLIST}.tmp ${AWK} '{ \ - if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /(omp.h|ompt.h|${EXTRAS_PATTERN}|libclang_rt|${PYCLANG_PATTERN})/) {printf "%%%%CLANG%%%%"} \ + if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /(${OPENMP_PATTERN}|${EXTRAS_PATTERN}|libclang_rt|${PYCLANG_PATTERN})/) {printf "%%%%CLANG%%%%"} \ if ($$0 ~ /${COMPILER_RT_PATTERN}/) \ {printf "%%%%COMPILER_RT%%%%"} \ if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \ if ($$0 ~ /(bin\/(ld|lld|wasm-ld))|liblld[^b]|\/lld\// && $$0 !~ /(lldb)/) {printf "%%%%LLD%%%%"} \ if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \ - if ($$0 ~ /(lib.*omp|omp.h|ompt.h)/) {printf "%%%%OPENMP%%%%"} \ + if ($$0 ~ /(${OPENMP_PATTERN})/) {printf "%%%%OPENMP%%%%"} \ if ($$0 ~ /(LLVMgold)/) {printf "%%%%GOLD%%%%"} \ if ($$0 ~ /${PYCLANG_PATTERN}/) {printf "%%%%PYCLANG%%%%"} \ if ($$0 !~ /(libclang_rt)/ && $$0 !~ /(${BE_PATTERN})$$/) {print}}' ${PLIST}.tmp >> ${PLIST} Modified: head/devel/llvm10/pkg-plist ============================================================================== --- head/devel/llvm10/pkg-plist Wed Feb 19 22:04:16 2020 (r526531) +++ head/devel/llvm10/pkg-plist Wed Feb 19 22:27:58 2020 (r526532) @@ -2848,7 +2848,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h %%GOLD%%llvm%%LLVM_SUFFIX%%/lib/LLVMgold.so %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_builtin_vars.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_cmath.h -%%CLANG%%%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_complex_builtins.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_complex_builtins.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_device_functions.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_intrinsics.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_libdevice_declares.h @@ -2904,7 +2904,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/clzerointrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cpuid.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cuda_wrappers/algorithm -%%CLANG%%%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cuda_wrappers/complex +%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cuda_wrappers/complex %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cuda_wrappers/new %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/emmintrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/enqcmdintrin.h @@ -2932,7 +2932,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/msa.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/mwaitxintrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/nmmintrin.h -%%CLANG%%%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/omp-tools.h +%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/omp-tools.h %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/omp.h %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ompt.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/opencl-c-base.h @@ -2987,11 +2987,11 @@ llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/AddLLVMDefinitions. llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/AddOCaml.cmake llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/AddSphinxTarget.cmake llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/CheckAtomic.cmake -%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/CheckCompilerVersion.cmake +llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/CheckCompilerVersion.cmake llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/CheckLinkerFlag.cmake llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/ChooseMSVCCRT.cmake -%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/CrossCompile.cmake -%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/DetermineGCCCompatible.cmake +llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/CrossCompile.cmake +llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/DetermineGCCCompatible.cmake llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/FindLibpfm.cmake llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/FindOCaml.cmake llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/FindSphinx.cmake @@ -3080,8 +3080,8 @@ llvm%%LLVM_SUFFIX%%/lib/libLTO.so llvm%%LLVM_SUFFIX%%/lib/libLTO.so.%%LLVM_MAJOR%%git llvm%%LLVM_SUFFIX%%/lib/libRemarks.so llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%git -llvm%%LLVM_SUFFIX%%/lib/libarcher.so -llvm%%LLVM_SUFFIX%%/lib/libarcher_static.a +%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libarcher.so +%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libarcher_static.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so.%%LLVM_MAJOR%%git %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002192227.01JMRwhh078447>