svn commit: r467658 - head/math/kig/files
Adriaan de Groot
adridg at FreeBSD.org
Tue Apr 17 20:56:03 UTC 2018
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)
More information about the svn-ports-all
mailing list