Skip to content

Conversation

@xclaesse
Copy link
Member

This solves problems with Strawberry Perl providing patch.exe on Windows with an unconsistent line ending support.

Fixes: #12092

This solves problems with Strawberry Perl providing patch.exe on Windows
with an unconsistent line ending support.

Fixes: mesonbuild#12092
@tristan957
Copy link
Member

s/unconsistent/inconsistent

@tristan957
Copy link
Member

Well, I think there's a decent chance we need to hard mask perl's version of patch.exe, if it's going to behave unusually surprisingly.

Do you think this PR should tackle this comment too? I think we already do something for pkg-config?

@tristan957
Copy link
Member

mlog.log(f'Found pkg-config {command_as_string!r} but it is Strawberry Perl and thus broken. Ignoring...')

@tristan957
Copy link
Member

Looks not possible to discover this given the discussion in the issue thread.

@xclaesse
Copy link
Member Author

I think it's not limited to Perl, there are different patch implementation and it depends how they deal with line ending. I think using git gives us a least something consistent across all platforms.

Copy link

@dvrogozh dvrogozh left a comment

Choose a reason for hiding this comment

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

This should improve applying patches to submodules which is one of key features of meson. Suggest to merge.

patch.exe is available from multiple origins which proves to have inconsistent behavior due to patches applied on top (or not applied) during build of the application. Like MSYS is well patched, but original patch.exe is not. See #12092 for details.

@xclaesse xclaesse merged commit 718c86a into mesonbuild:master Sep 14, 2023
@xclaesse xclaesse deleted the git-patch branch September 14, 2023 10:58
@nirbheek nirbheek added this to the 1.2.2 milestone Sep 28, 2023
mikedickey added a commit to jacktrip/jacktrip that referenced this pull request Jan 11, 2024
Since the pip version uses outdated version of meson where diff_files is broken

See mesonbuild/meson#12092 and mesonbuild/meson#12248
mikedickey added a commit to jacktrip/jacktrip that referenced this pull request Jan 11, 2024
Since the pip version uses outdated version of meson where diff_files is broken

See mesonbuild/meson#12092 and mesonbuild/meson#12248
mikedickey added a commit to jacktrip/jacktrip that referenced this pull request Jan 11, 2024
Since the pip version uses outdated version of meson where diff_files is broken

See mesonbuild/meson#12092 and mesonbuild/meson#12248
mikedickey added a commit to jacktrip/jacktrip that referenced this pull request Jan 11, 2024
Since the pip version uses outdated version of meson where diff_files is broken

See mesonbuild/meson#12092 and mesonbuild/meson#12248
mikedickey added a commit to jacktrip/jacktrip that referenced this pull request Jan 11, 2024
Since the pip version uses outdated version of meson where diff_files is broken

See mesonbuild/meson#12092 and mesonbuild/meson#12248
mikedickey added a commit to jacktrip/jacktrip that referenced this pull request Jan 11, 2024
Since the pip version uses outdated version of meson where diff_files is broken

See mesonbuild/meson#12092 and mesonbuild/meson#12248
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Make diff_file resilient to line-ending differences on Windows

4 participants