From owner-svn-ports-head@freebsd.org Tue Apr 17 20:56:03 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 87BE1F9A755; Tue, 17 Apr 2018 20:56:03 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ECE4079A3F; Tue, 17 Apr 2018 20:56:02 +0000 (UTC) (envelope-from adridg@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 E7CDF11ADA; Tue, 17 Apr 2018 20:56:02 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3HKu2Th069851; Tue, 17 Apr 2018 20:56:02 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3HKu2D0069850; Tue, 17 Apr 2018 20:56:02 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201804172056.w3HKu2D0069850@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Tue, 17 Apr 2018 20:56:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467658 - head/math/kig/files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: head/math/kig/files X-SVN-Commit-Revision: 467658 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.25 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, 17 Apr 2018 20:56:03 -0000 Author: adridg Date: Tue Apr 17 20:56:02 2018 New Revision: 467658 URL: https://svnweb.freebsd.org/changeset/ports/467658 Log: Fix math/kig build failures because it can't find Boost::Python. This is another bit of fallout from the change in CMake 3.11.0 which respects CMAKE_REQUIRED_LIBRARIES in check_headers. It took a while for us to be able to reproduce the problem, though. Submitted by: tcberner Reported by: pkg-fallout Reviewed by: adridg Approved by: tcberner (mentor, implicit) Added: head/math/kig/files/ head/math/kig/files/patch-cmake_modules_FindBoostPython.cmake (contents, props changed) Added: head/math/kig/files/patch-cmake_modules_FindBoostPython.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/kig/files/patch-cmake_modules_FindBoostPython.cmake Tue Apr 17 20:56:02 2018 (r467658) @@ -0,0 +1,22 @@ +--- cmake/modules/FindBoostPython.cmake.orig 2018-01-06 04:25:23 UTC ++++ cmake/modules/FindBoostPython.cmake +@@ -36,7 +36,8 @@ find_package(Boost QUIET COMPONENTS pyth + cmake_push_check_state() + set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}) + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${Boost_INCLUDE_DIRS}) +-set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${Boost_PYTHON_LIBRARY}) ++# Don't mess with check_include_file_cxx ++set(CMAKE_REQUIRED_LIBRARIES "") + + check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP) + +@@ -46,6 +47,9 @@ check_include_file_cxx(boost/shared_ptr. + # If user wants to shoot himself in the foot, he is allowed to do this, too. + set(BoostPython_COMPILES) + ++# Now that the header has been found, set the libraries. ++set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${Boost_PYTHON_LIBRARY}) ++ + # If shared_ptr.hpp or Python library is not available, then there is + # no point to do anything. + if(HAVE_BOOST_SHARED_PTR_HPP AND Boost_PYTHON_FOUND)