talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

boost188: fix cmake file

Browse Source
This commit is contained in:
chn 2025-07-29 22:02:45 +08:00
parent dc9637876d
commit ae795c5349
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/boost/cmake-paths-188.patch Normal file
View File

@ -0,0 +1,21 @@
diff --color -ur boost_1_88_0-unpatched/tools/boost_install/boost-install.jam boost_1_88_0/tools/boost_install/boost-install.jam
--- boost_1_88_0-unpatched/tools/boost_install/boost-install.jam 2025-07-29 21:46:33.010181683 +0800
+++ boost_1_88_0/tools/boost_install/boost-install.jam 2025-07-29 21:47:34.346642613 +0800
@@ -794,7 +794,7 @@
""
"# Compute the include and library directories relative to this file."
""
- "get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)"
+ "get_filename_component(_BOOST_REAL_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)"
: true ;
if [ path.is-rooted $(cmakedir) ]
@@ -813,6 +813,8 @@
" 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 ;
}

1
pkgs/development/libraries/boost/generic.nix
View File

@ -170,6 +170,7 @@ stdenv.mkDerivation {
lib.versionOlder version "1.88" && stdenv.hostPlatform.isDarwin
) ./darwin-no-system-python.patch
++ lib.optional (lib.versionOlder version "1.88") ./cmake-paths-173.patch
++ lib.optional (lib.versionAtLeast version "1.88") ./cmake-paths-188.patch
++ lib.optional (version == "1.77.0") (fetchpatch {
url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch";
relative = "include";