Index: head/math/combblas/Makefile =================================================================== --- head/math/combblas/Makefile (revision 487562) +++ head/math/combblas/Makefile (revision 487563) @@ -1,33 +1,28 @@ # $FreeBSD$ PORTNAME= CombBLAS DISTVERSION= 1.6.2 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= https://people.eecs.berkeley.edu/~aydin/${PORTNAME}_FILES/ DISTNAME= ${PORTNAME}_beta_${DISTVERSION:S/.//:S/./_/} MAINTAINER= yuri@FreeBSD.org COMMENT= Combinatorial BLAS library: an extensible parallel graph library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libmpi.so:net/mpich +LIB_DEPENDS= libmpi.so:net/mpich \ + libomp.so:devel/openmp RUN_DEPENDS= ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so.1:lang/gcc${GCC_DEFAULT} # because of the link flags induced by mpich USES= cmake:outsource localbase:ldflags tar:tgz USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS -LDFLAGS+= ${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/libomp.so - -# use clang from ports because cmake can't find OpenMP with base clang, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223678 -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -CPP= clang-cpp${LLVM_DEFAULT} -CC= clang${LLVM_DEFAULT} -CXX= clang++${LLVM_DEFAULT} post-extract: @cd ${WRKSRC}/include && ${RM} .DS_Store ._.DS_Store CombBLAS/._CombBLAS.h .include Index: head/math/combblas/files/patch-CMakeLists.txt =================================================================== --- head/math/combblas/files/patch-CMakeLists.txt (nonexistent) +++ head/math/combblas/files/patch-CMakeLists.txt (revision 487563) @@ -0,0 +1,24 @@ +--- CMakeLists.txt.orig 2018-12-16 07:56:08 UTC ++++ CMakeLists.txt +@@ -23,7 +23,11 @@ target_include_directories(CombBLAS PRIV + + # MPI and OpenMP dependencies + find_package(MPI REQUIRED) +-find_package(OpenMP REQUIRED) ++#find_package(OpenMP REQUIRED) ++set(OPENMP_FOUND TRUE) ++set(OpenMP_CXX_FOUND TRUE) ++set(OpenMP_CXX_FLAGS "") ++set(OpenMP_LINK_FLAGS "-lomp") + + if(TARGET MPI::MPI_CXX) # Use target if available (cmake >= 3.9) + target_link_libraries(CombBLAS PUBLIC MPI::MPI_CXX) +@@ -40,7 +44,7 @@ if(OPENMP_FOUND OR OpenMP_CXX_FOUND) + target_link_libraries(CombBLAS PUBLIC OpenMP::OpenMP_CXX) + else() + target_compile_options(CombBLAS PUBLIC "${OpenMP_CXX_FLAGS}") +- target_link_libraries(CombBLAS PUBLIC "${OpenMP_CXX_FLAGS}") ++ target_link_libraries(CombBLAS PUBLIC "${OpenMP_LINK_FLAGS}") + endif() + endif() + Property changes on: head/math/combblas/files/patch-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property