- Update of rootfile - With the new update of curl changes were made to CURLOPT which resulted in cmake using an undocumented type. - This patch has been merged in the cmake git repo and will become available in version cmake-4.1.2 so the patch will be able to be removed when that version is released and updated in IPFire.
Signed-off-by: Adolf Belka <[email protected]> --- config/rootfiles/common/cmake | 12 ++++++------ lfs/cmake | 1 + ...ocumented_type_for_CURLOPT_PROXYTYPE_values.patch | 11 +++++++++++ 3 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 src/patches/cmake-4.1.1_Avoid_using_undocumented_type_for_CURLOPT_PROXYTYPE_values.patch diff --git a/config/rootfiles/common/cmake b/config/rootfiles/common/cmake index 50599f3fa..69b827b02 100644 --- a/config/rootfiles/common/cmake +++ b/config/rootfiles/common/cmake @@ -3191,12 +3191,12 @@ #usr/share/cmake-4.1/Modules/Platform/Android/abi-x86-GNU.cmake #usr/share/cmake-4.1/Modules/Platform/Android/abi-x86_64-Clang.cmake #usr/share/cmake-4.1/Modules/Platform/Android/abi-x86_64-GNU.cmake -#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-c##.cmake -#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-c##_shared.cmake -#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-c##_static.cmake -#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-gabi##.cmake -#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-gabi##_shared.cmake -#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-gabi##_static.cmake +#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-c++.cmake +#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-c++_shared.cmake +#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-c++_static.cmake +#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-gabi++.cmake +#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-gabi++_shared.cmake +#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-gabi++_static.cmake #usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-gnustl.cmake #usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-gnustl_shared.cmake #usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-gnustl_static.cmake diff --git a/lfs/cmake b/lfs/cmake index f88ddeb36..4722705dd 100644 --- a/lfs/cmake +++ b/lfs/cmake @@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && sed -i '/"lib64"/s/64//' Modules/GNUInstallDirs.cmake + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cmake-4.1.1_Avoid_using_undocumented_type_for_CURLOPT_PROXYTYPE_values.patch cd $(DIR_APP) && ./bootstrap \ --prefix=/usr \ --mandir=/share/man \ diff --git a/src/patches/cmake-4.1.1_Avoid_using_undocumented_type_for_CURLOPT_PROXYTYPE_values.patch b/src/patches/cmake-4.1.1_Avoid_using_undocumented_type_for_CURLOPT_PROXYTYPE_values.patch new file mode 100644 index 000000000..c4232705f --- /dev/null +++ b/src/patches/cmake-4.1.1_Avoid_using_undocumented_type_for_CURLOPT_PROXYTYPE_values.patch @@ -0,0 +1,11 @@ +--- cmake-4.1.1/Source/CTest/cmCTestCurl.h.orig 2025-08-27 18:33:28.000000000 +0200 ++++ cmake-4.1.1/Source/CTest/cmCTestCurl.h 2025-09-13 15:07:02.531027863 +0200 +@@ -52,7 +52,7 @@ + std::vector<std::string> HttpHeaders; + std::string HTTPProxyAuth; + std::string HTTPProxy; +- curl_proxytype HTTPProxyType; ++ long HTTPProxyType; + bool UseHttp10 = false; + bool Quiet = false; + int TimeOutSeconds = 0; -- 2.51.0
