From owner-svn-ports-all@freebsd.org Fri Nov 29 22:24:46 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 98C371BE4F4; Fri, 29 Nov 2019 22:24:46 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47PpwG3X0lz4NbG; Fri, 29 Nov 2019 22:24:46 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3F5361CCF2; Fri, 29 Nov 2019 22:24:46 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xATMOkDK083449; Fri, 29 Nov 2019 22:24:46 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xATMOj7x083447; Fri, 29 Nov 2019 22:24:45 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201911292224.xATMOj7x083447@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Fri, 29 Nov 2019 22:24:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518679 - in head/devel/dmlc-core: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/devel/dmlc-core: . files X-SVN-Commit-Revision: 518679 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Nov 2019 22:24:46 -0000 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@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 -.include - -.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 -LLVM_DEFAULT= 80 +.if ${CHOSEN_COMPILER_TYPE} == gcc +USE_GCC= yes .endif -.include +.include 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 + $ + $) + 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 +