svn commit: r518679 - in head/devel/dmlc-core: . files

Piotr Kubaj pkubaj at FreeBSD.org
Fri Nov 29 22:24:46 UTC 2019


Author: pkubaj
Date: Fri Nov 29 22:24:45 2019
New Revision: 518679
URL: https://svnweb.freebsd.org/changeset/ports/518679

Log:
  devel/dmlc-core: fix build on GCC architectures
  
  Use USES=compiler:openmp instead of hard dependency on ports LLVM. Use new GCC when using base GCC.
  
  Remove -D_POSIX_SOURCE -D_POSIX_C_SOURCE=200809L, this causes some errno.h macros not being visible.
  
  PR:             242234
  Approved by:    yuri (maintainer), linimon (mentor)
  Differential Revision:  https://reviews.freebsd.org/D22580

Added:
  head/devel/dmlc-core/files/
  head/devel/dmlc-core/files/patch-CMakeLists.txt   (contents, props changed)
Modified:
  head/devel/dmlc-core/Makefile

Modified: head/devel/dmlc-core/Makefile
==============================================================================
--- head/devel/dmlc-core/Makefile	Fri Nov 29 22:12:35 2019	(r518678)
+++ head/devel/dmlc-core/Makefile	Fri Nov 29 22:24:45 2019	(r518679)
@@ -4,6 +4,7 @@ PORTNAME=	dmlc-core
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3-105
 DISTVERSIONSUFFIX=	-g32d9fe7
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri at FreeBSD.org
@@ -11,24 +12,17 @@ COMMENT=	Common library for scalable and portable dist
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
-
-USES=		cmake
+USES=		compiler:openmp cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	dmlc
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
-# use clang from ports because otherwise OpenMP isn't detected on some systems (ex. 12.0-RELEASE-p9)
-CPP=		clang-cpp${LLVM_DEFAULT}
-CC=		clang${LLVM_DEFAULT}
-CXX=		clang++${LLVM_DEFAULT}
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.options.mk>
-
-.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
-LLVM_DEFAULT=	80
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+USE_GCC=	yes
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Added: head/devel/dmlc-core/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/dmlc-core/files/patch-CMakeLists.txt	Fri Nov 29 22:24:45 2019	(r518679)
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2019-11-25 13:40:31 UTC
++++ CMakeLists.txt
+@@ -207,7 +207,7 @@ target_include_directories(dmlc PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>)
+ target_compile_definitions(dmlc PRIVATE -D_XOPEN_SOURCE=700
+-  -D_POSIX_SOURCE -D_POSIX_C_SOURCE=200809L -D_DARWIN_C_SOURCE
++  -D_DARWIN_C_SOURCE
+   -DDMLC_CORE_USE_CMAKE)
+ # DMLC_CORE_USE_CMAKE macro constant indicates the use of CMake
+ 


More information about the svn-ports-head mailing list