Date: Fri, 1 May 2020 16:53:40 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533561 - in head/math/combblas: . files Message-ID: <202005011653.041GreIo026810@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Fri May 1 16:53:39 2020 New Revision: 533561 URL: https://svnweb.freebsd.org/changeset/ports/533561 Log: math/combblas: fix build on GCC architectures GCC doesn't have libomp. PR: 246090 Approved by: yuri (maintainer) MFH: 2020Q2 (fix build blanket) Added: head/math/combblas/files/extra-patch-CMakeLists.txt - copied unchanged from r533560, head/math/combblas/files/patch-CMakeLists.txt Deleted: head/math/combblas/files/patch-CMakeLists.txt Modified: head/math/combblas/Makefile Modified: head/math/combblas/Makefile ============================================================================== --- head/math/combblas/Makefile Fri May 1 16:47:30 2020 (r533560) +++ head/math/combblas/Makefile Fri May 1 16:53:39 2020 (r533561) @@ -20,6 +20,8 @@ USES= cmake compiler:c++14-lang localbase:ldflags tar USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS +EXTRA_PATCHES= ${EXTRA_PATCHES_${CHOSEN_COMPILER_TYPE}} +EXTRA_PATCHES_clang= ${FILESDIR}/extra-patch-CMakeLists.txt post-extract: @cd ${WRKSRC}/include && ${RM} .DS_Store ._.DS_Store CombBLAS/._CombBLAS.h Copied: head/math/combblas/files/extra-patch-CMakeLists.txt (from r533560, head/math/combblas/files/patch-CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/combblas/files/extra-patch-CMakeLists.txt Fri May 1 16:53:39 2020 (r533561, copy of r533560, head/math/combblas/files/patch-CMakeLists.txt) @@ -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() +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005011653.041GreIo026810>