Skip to content

[win32] add extra patch args for civetweb - #23205

Merged
linev merged 1 commit into
root-project:masterfrom
linev:civetweb_win
Sep 1, 2026
Merged

[win32] add extra patch args for civetweb#23205
linev merged 1 commit into
root-project:masterfrom
linev:civetweb_win

Conversation

@linev

@linev linev commented Aug 31, 2026

Copy link
Copy Markdown
Member

If such flags not default or not configured to git, applying patch on Windows may fail.
Adding "--ignore-space-change" convert patch failure just to warnings

@linev linev self-assigned this Aug 31, 2026
@linev
linev requested a review from bellenot as a code owner August 31, 2026 15:13
@linev
linev requested a review from ferdymercury August 31, 2026 15:13

@ferdymercury ferdymercury left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@linev

linev commented Aug 31, 2026

Copy link
Copy Markdown
Member Author

@ferdymercury Do we have other places like this, I encounter problem on my Windows machine

If such flags not default or not configured to git,
applying patch on Windows may fail.
Adding "--ignore-space-change" convert patch failure just to warnings
@ferdymercury

Copy link
Copy Markdown
Collaborator

@ferdymercury Do we have other places like this, I encounter problem on my Windows machine

These builtins have it already:

builtins/gl2ps/CMakeLists.txt:  set(patch_args --ignore-whitespace)
builtins/libgif/CMakeLists.txt:  set(patch_args --ignore-whitespace)
builtins/cfitsio/CMakeLists.txt:  set(patch_args --ignore-whitespace)
builtins/unuran/CMakeLists.txt:  set(UNURAN_PATCH_COMMAND PATCH_COMMAND ${GIT_EXECUTABLE} init COMMAND ${GIT_EXECUTABLE} apply --ignore-space-change --ignore-whitespace ${ROOT_UNURAN_PATCH_FILE_1})
builtins/xxhash/CMakeLists.txt:  set(XXHASH_PATCH_COMMAND PATCH_COMMAND ${GIT_EXECUTABLE} init COMMAND ${GIT_EXECUTABLE} apply --ignore-space-change --ignore-whitespace ${ROOT_XXHASH_PATCH_FILE})

@github-actions

github-actions Bot commented Sep 1, 2026

Copy link
Copy Markdown

Test Results

    23 files      23 suites   3d 13h 49m 31s ⏱️
 3 860 tests  3 858 ✅ 0 💤 2 ❌
78 655 runs  78 652 ✅ 1 💤 2 ❌

For more details on these failures, see this check.

Results for commit 8fef37b.

@linev
linev requested a review from guitargeek September 1, 2026 13:01

@guitargeek guitargeek left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@linev
linev merged commit a96f0b8 into root-project:master Sep 1, 2026
32 of 34 checks passed
@linev
linev deleted the civetweb_win branch September 1, 2026 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants