svn commit: r533563 - in branches/2020Q2/math/combblas: . files

[Piotr Kubaj]

Author: pkubaj
Date: Fri May  1 16:58:08 2020
New Revision: 533563
URL: https://svnweb.freebsd.org/changeset/ports/533563

Log:
  MFH: r533561
  
  math/combblas: fix build on GCC architectures
  
  GCC doesn't have libomp.
  
  PR:		246090
  Approved by:	yuri (maintainer)
  
  Approved by:	portmgr (fix build blanket)

Added:
  branches/2020Q2/math/combblas/files/extra-patch-CMakeLists.txt
     - copied unchanged from r533561, head/math/combblas/files/extra-patch-CMakeLists.txt
Deleted:
  branches/2020Q2/math/combblas/files/patch-CMakeLists.txt
Modified:
  branches/2020Q2/math/combblas/Makefile
Directory Properties:
  branches/2020Q2/   (props changed)

Modified: branches/2020Q2/math/combblas/Makefile
==============================================================================
--- branches/2020Q2/math/combblas/Makefile	Fri May  1 16:56:33 2020	(r533562)
+++ branches/2020Q2/math/combblas/Makefile	Fri May  1 16:58:08 2020	(r533563)
@@ -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: branches/2020Q2/math/combblas/files/extra-patch-CMakeLists.txt (from r533561, head/math/combblas/files/extra-patch-CMakeLists.txt)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q2/math/combblas/files/extra-patch-CMakeLists.txt	Fri May  1 16:58:08 2020	(r533563, copy of r533561, head/math/combblas/files/extra-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()
+