From owner-svn-ports-head@freebsd.org Sun Sep 6 17:59:16 2020 Return-Path: Delivered-To: svn-ports-head@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 EC2F33D8D07; Sun, 6 Sep 2020 17:59:16 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4Bkzgm61M2z4H6w; Sun, 6 Sep 2020 17:59:16 +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 B1CFF127BE; Sun, 6 Sep 2020 17:59:16 +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 086HxG3S073772; Sun, 6 Sep 2020 17:59:16 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 086HxGo0073771; Sun, 6 Sep 2020 17:59:16 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202009061759.086HxGo0073771@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Sun, 6 Sep 2020 17:59:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547860 - in head/math/flann: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/math/flann: . files X-SVN-Commit-Revision: 547860 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Sep 2020 17:59:17 -0000 Author: pkubaj Date: Sun Sep 6 17:59:16 2020 New Revision: 547860 URL: https://svnweb.freebsd.org/changeset/ports/547860 Log: math/flann: fix build on GCC architectures Last addition to files/patch-src_cpp_CMakeLists.txt breaks build. Also require newer GCC. PR: 249152 Approved by: yuri (maintainer) Modified: head/math/flann/Makefile head/math/flann/files/patch-src_cpp_CMakeLists.txt Modified: head/math/flann/Makefile ============================================================================== --- head/math/flann/Makefile Sun Sep 6 17:52:25 2020 (r547859) +++ head/math/flann/Makefile Sun Sep 6 17:59:16 2020 (r547860) @@ -15,7 +15,7 @@ LIB_DEPENDS= libhdf5.so:science/hdf5 \ liblz4.so:archivers/liblz4 \ libsz.so:science/szip -USES= cmake localbase:ldflags pkgconfig +USES= cmake compiler:c++11-lang localbase:ldflags pkgconfig USE_GITHUB= yes GH_ACCOUNT= mariusmuja USE_LDCONFIG= yes Modified: head/math/flann/files/patch-src_cpp_CMakeLists.txt ============================================================================== --- head/math/flann/files/patch-src_cpp_CMakeLists.txt Sun Sep 6 17:52:25 2020 (r547859) +++ head/math/flann/files/patch-src_cpp_CMakeLists.txt Sun Sep 6 17:59:16 2020 (r547860) @@ -1,6 +1,6 @@ --- src/cpp/CMakeLists.txt.orig 2019-04-07 03:21:23 UTC +++ src/cpp/CMakeLists.txt -@@ -25,11 +25,11 @@ if (BUILD_CUDA_LIB) +@@ -25,6 +25,6 @@ if (BUILD_CUDA_LIB) else() set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};" ) endif() @@ -8,9 +8,3 @@ + cuda_add_library(flann_cuda_s SHARED ${CU_SOURCES}) set_property(TARGET flann_cuda_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC) endif() - --if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) -+if(CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD|DragonFly" AND CMAKE_COMPILER_IS_GNUCC) - add_library(flann_cpp SHARED "") - set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX) - target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)