From owner-svn-ports-head@freebsd.org Tue Sep 22 07:16:51 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 751E63E023A; Tue, 22 Sep 2020 07:16:51 +0000 (UTC) (envelope-from yuri@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 4BwXg72XKxz4cf0; Tue, 22 Sep 2020 07:16:51 +0000 (UTC) (envelope-from yuri@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 3B3811BAA9; Tue, 22 Sep 2020 07:16:51 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08M7Gpxm087723; Tue, 22 Sep 2020 07:16:51 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08M7GpEE087722; Tue, 22 Sep 2020 07:16:51 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202009220716.08M7GpEE087722@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Tue, 22 Sep 2020 07:16:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549561 - head/math/flann/files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/math/flann/files X-SVN-Commit-Revision: 549561 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: Tue, 22 Sep 2020 07:16:51 -0000 Author: yuri Date: Tue Sep 22 07:16:50 2020 New Revision: 549561 URL: https://svnweb.freebsd.org/changeset/ports/549561 Log: math/flann: Fix build on 11 clang-8 in FreeBSD 11 doesn't know -Wl,--push-state / -Wl,--pop-state Reported by: fallout MFH: 2020Q3 Modified: head/math/flann/files/patch-src_cpp_CMakeLists.txt Modified: head/math/flann/files/patch-src_cpp_CMakeLists.txt ============================================================================== --- head/math/flann/files/patch-src_cpp_CMakeLists.txt Tue Sep 22 06:06:15 2020 (r549560) +++ head/math/flann/files/patch-src_cpp_CMakeLists.txt Tue Sep 22 07:16:50 2020 (r549561) @@ -1,6 +1,6 @@ --- src/cpp/CMakeLists.txt.orig 2019-04-07 03:21:23 UTC +++ src/cpp/CMakeLists.txt -@@ -25,6 +25,6 @@ if (BUILD_CUDA_LIB) +@@ -25,7 +25,7 @@ if (BUILD_CUDA_LIB) else() set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};" ) endif() @@ -8,3 +8,31 @@ + cuda_add_library(flann_cuda_s SHARED ${CU_SOURCES}) set_property(TARGET flann_cuda_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC) endif() + +@@ -43,7 +43,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPIL + endif() + else() + add_library(flann_cpp SHARED ${CPP_SOURCES}) +- target_link_libraries(flann_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) ++ target_link_libraries(flann_cpp -Wl,--no-as-needed ${LZ4_LIBRARIES}) # clang-8 in FreeBSD 11 doesn't know -Wl,--push-state / -Wl,--pop-state + # export lz4 headers, so that MSVC to creates flann_cpp.lib + set_target_properties(flann_cpp PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS YES) + if (BUILD_CUDA_LIB) +@@ -81,7 +81,7 @@ endif() + + if (BUILD_C_BINDINGS) + add_library(flann_s STATIC ${C_SOURCES}) +- target_link_libraries(flann_s -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) ++ target_link_libraries(flann_s -Wl,--no-as-needed ${LZ4_LIBRARIES}) + if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) + set_target_properties(flann_s PROPERTIES COMPILE_FLAGS -fPIC) + endif() +@@ -93,7 +93,7 @@ if (BUILD_C_BINDINGS) + target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive) + else() + add_library(flann SHARED ${C_SOURCES}) +- target_link_libraries(flann -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) ++ target_link_libraries(flann -Wl,--no-as-needed ${LZ4_LIBRARIES}) + + if(MINGW AND OPENMP_FOUND) + target_link_libraries(flann gomp)