mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-22 14:27:11 +00:00
777df0b4a5
Boost generates its installed cmake configuration using custom logic in its own build system; while this logic *knows* where it should be installed, the generated config overrides the correct information with new paths based on the location of the cmake configuration file in an attempt to let the package be relocated after installation. This patch simply undoes that.
22 lines
1 KiB
Diff
22 lines
1 KiB
Diff
diff --git a/tools/boost_install/boost-install.jam b/tools/boost_install/boost-install.jam
|
|
index ad19f7b55..ec6bf57ff 100644
|
|
--- a/tools/boost_install/boost-install.jam
|
|
+++ b/tools/boost_install/boost-install.jam
|
|
@@ -587,6 +587,7 @@ rule generate-cmake-config- ( target : sources * : properties * )
|
|
"# Compute the include and library directories relative to this file."
|
|
""
|
|
"get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" ABSOLUTE)"
|
|
+ "get_filename_component(_BOOST_REAL_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" ABSOLUTE)"
|
|
: true ;
|
|
|
|
if [ path.is-rooted $(cmakedir) ]
|
|
@@ -607,6 +608,8 @@ rule generate-cmake-config- ( target : sources * : properties * )
|
|
" unset(_BOOST_CMAKEDIR_ORIGINAL)"
|
|
"endif()"
|
|
""
|
|
+ "# Assume that the installer actually did know where the libs were to be installed"
|
|
+ "get_filename_component(_BOOST_CMAKEDIR \"$(cmakedir-native)\" REALPATH)"
|
|
: true ;
|
|
}
|
|
|