juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-10 02:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: scope the CRLF override to the git apply invocation

Browse Source 
git config wrote core.autocrlf into the repository git init creates in the
extracted CPython source. Nothing outside deps/build reads that repository, so
the setting was already contained.

-c applies the override to the one invocation instead, so no repository config is
written at all. It cannot reuse PATCH_CMD, so the shared flags are spelled out here.
This commit is contained in:
raistlin7447
2026-08-31 08:20:26 -05:00
parent 575a874832
commit 4d67159ea2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
deps/python3/python3.cmake vendored
View File

@@ -16,11 +16,12 @@ if(WIN32)
# Patch from https://github.com/python/cpython/pull/153608 # Patch from https://github.com/python/cpython/pull/153608
# This patch has not been merged to 3.12 yet so we need to apply it manually # This patch has not been merged to 3.12 yet so we need to apply it manually
# #
# The config lands on the CPython repo git init just made, not OrcaSlicer. Without # Without core.autocrlf=false the patched find_python.bat comes out LF and
# it the patched find_python.bat comes out LF and cmd.exe cannot find its goto labels. # cmd.exe cannot find its goto labels.
set(_patch_cmd git init set(_patch_cmd git init
&& git config core.autocrlf false && ${GIT_EXECUTABLE} -c core.autocrlf=false apply --verbose
&& ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/01-windows-nuget.patch) --ignore-space-change --whitespace=fix
${CMAKE_CURRENT_LIST_DIR}/01-windows-nuget.patch)
if(MSVC_VERSION EQUAL 1800) if(MSVC_VERSION EQUAL 1800)
set(_python_platform_toolset v120) set(_python_platform_toolset v120)