fix cmake invalid path err
This commit is contained in:
parent
bd10b67d19
commit
43777c8c09
31
boost-remove-cmakedir.patch
Normal file
31
boost-remove-cmakedir.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
Index: boost_1_80_0/tools/boost_install/boost-install.jam
|
||||||
|
===================================================================
|
||||||
|
--- boost_1_80_0.orig/tools/boost_install/boost-install.jam
|
||||||
|
+++ boost_1_80_0/tools/boost_install/boost-install.jam
|
||||||
|
@@ -753,25 +753,6 @@ rule generate-cmake-config- ( target : s
|
||||||
|
"get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)"
|
||||||
|
: true ;
|
||||||
|
|
||||||
|
- if [ path.is-rooted $(cmakedir) ]
|
||||||
|
- {
|
||||||
|
- local cmakedir-native = [ path-native-fwd $(cmakedir) ] ;
|
||||||
|
-
|
||||||
|
- print.text
|
||||||
|
-
|
||||||
|
- ""
|
||||||
|
- "# If the computed and the original directories are symlink-equivalent, use original"
|
||||||
|
- "if(EXISTS \"$(cmakedir-native)\")"
|
||||||
|
- " get_filename_component(_BOOST_CMAKEDIR_ORIGINAL \"$(cmakedir-native)\" REALPATH)"
|
||||||
|
- " if(_BOOST_CMAKEDIR STREQUAL _BOOST_CMAKEDIR_ORIGINAL)"
|
||||||
|
- " set(_BOOST_CMAKEDIR \"$(cmakedir-native)\")"
|
||||||
|
- " endif()"
|
||||||
|
- " unset(_BOOST_CMAKEDIR_ORIGINAL)"
|
||||||
|
- "endif()"
|
||||||
|
- ""
|
||||||
|
- : true ;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
get-dir "_BOOST_INCLUDEDIR" : $(includedir) ;
|
||||||
|
|
||||||
|
if $(library-type) = INTERFACE
|
||||||
|
|
||||||
@ -19,6 +19,7 @@ Patch4: boost-1.81-random-test-Add-missing-includes.patch
|
|||||||
# https://github.com/boostorg/phoenix/pull/116
|
# https://github.com/boostorg/phoenix/pull/116
|
||||||
Patch5: boost-1.81-phoenix-Update-avoid-placeholders-uarg1.10-ODR-violates.patch
|
Patch5: boost-1.81-phoenix-Update-avoid-placeholders-uarg1.10-ODR-violates.patch
|
||||||
Patch6: dynamic_linking.patch
|
Patch6: dynamic_linking.patch
|
||||||
|
Patch7: boost-remove-cmakedir.patch
|
||||||
Requires: %{name}-atomic%{?_isa} = %{version}-%{release}
|
Requires: %{name}-atomic%{?_isa} = %{version}-%{release}
|
||||||
Requires: %{name}-chrono%{?_isa} = %{version}-%{release}
|
Requires: %{name}-chrono%{?_isa} = %{version}-%{release}
|
||||||
Requires: %{name}-container%{?_isa} = %{version}-%{release}
|
Requires: %{name}-container%{?_isa} = %{version}-%{release}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user