diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2018-04-17 20:56:02 +0000 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2018-04-17 20:56:02 +0000 |
| commit | 60cab92e34e57cd6b6f78c9a84d3cc7fc5e56753 (patch) | |
| tree | f2cd918e0274a3f588b1cf115d0e2726a98414cd | |
| parent | devel/RStudio: Update 1.1.444 -> 1.1.445 (diff) | |
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)
Notes
Notes:
svn path=/head/; revision=467658
| -rw-r--r-- | math/kig/files/patch-cmake_modules_FindBoostPython.cmake | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/math/kig/files/patch-cmake_modules_FindBoostPython.cmake b/math/kig/files/patch-cmake_modules_FindBoostPython.cmake new file mode 100644 index 000000000000..05ebe603f441 --- /dev/null +++ b/math/kig/files/patch-cmake_modules_FindBoostPython.cmake @@ -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) |