Put openmp in the right place so it is built and installed.

PR:		222727
This commit is contained in:
Brooks Davis 2017-10-14 23:38:31 +00:00
parent e6ea6764d8
commit 67387b6bf7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=452094
3 changed files with 10 additions and 6 deletions

View file

@ -2,7 +2,7 @@
PORTNAME= llvm
DISTVERSION= 5.0.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= devel lang
MASTER_SITES= http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
PKGNAMESUFFIX= ${LLVM_SUFFIX}
@ -361,7 +361,7 @@ post-extract-LLDB-on:
${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb
post-extract-OPENMP-on:
${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/tools/openmp
${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/projects/openmp
post-patch:
${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \

View file

@ -1,5 +1,5 @@
--- tools/openmp/runtime/cmake/LibompHandleFlags.cmake.orig 2017-03-16 15:50:48 UTC
+++ tools/openmp/runtime/cmake/LibompHandleFlags.cmake
--- projects/openmp/runtime/cmake/LibompHandleFlags.cmake.orig 2017-03-16 15:50:48 UTC
+++ projects/openmp/runtime/cmake/LibompHandleFlags.cmake
@@ -156,6 +156,11 @@ function(libomp_get_libflags libflags)
if(${IA32})
libomp_append(libflags_local -lirc_pic LIBOMP_HAVE_IRC_PIC_LIBRARY)
@ -16,8 +16,8 @@
runtime/cmake/LibompMicroTests.cmake | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
--- tools/openmp/runtime/cmake/LibompMicroTests.cmake.orig 2017-03-16 15:50:48 UTC
+++ tools/openmp/runtime/cmake/LibompMicroTests.cmake
--- projects/openmp/runtime/cmake/LibompMicroTests.cmake.orig 2017-03-16 15:50:48 UTC
+++ projects/openmp/runtime/cmake/LibompMicroTests.cmake
@@ -171,7 +171,7 @@ add_custom_command(
add_custom_target(libomp-test-deps DEPENDS test-deps/.success)
set(libomp_expected_library_deps)

View file

@ -2368,6 +2368,7 @@ llvm%%LLVM_LIB_VER%%/lib/LLVMHello.so
%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/msa.h
%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/mwaitxintrin.h
%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/nmmintrin.h
%%OPENMP%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/omp.h
%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/opencl-c.h
%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/pkuintrin.h
%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/pmmintrin.h
@ -2610,6 +2611,8 @@ llvm%%LLVM_LIB_VER%%/lib/libLTO.so.5
%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangToolingCore.a
%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangToolingRefactor.a
%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libfindAllSymbols.a
%%OPENMP%%llvm%%LLVM_LIB_VER%%/lib/libgomp.so
%%OPENMP%%llvm%%LLVM_LIB_VER%%/lib/libiomp5.so
%%LLD%%llvm%%LLVM_LIB_VER%%/lib/liblldCOFF.a
%%LLD%%llvm%%LLVM_LIB_VER%%/lib/liblldConfig.a
%%LLD%%llvm%%LLVM_LIB_VER%%/lib/liblldCore.a
@ -2710,6 +2713,7 @@ llvm%%LLVM_LIB_VER%%/lib/libLTO.so.5
%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbTarget.a
%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbUtility.a
%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbUtilityHelpers.a
%%OPENMP%%llvm%%LLVM_LIB_VER%%/lib/libomp.so
%%CLANG%%llvm%%LLVM_LIB_VER%%/libexec/c++-analyzer
%%CLANG%%llvm%%LLVM_LIB_VER%%/libexec/ccc-analyzer
%%CLANG%%llvm%%LLVM_LIB_VER%%/share/clang/bash-autocomplete.sh