diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2023-08-08 12:13:53 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-04-24 15:50:35 +0200 |
| commit | c1256034ffb585cd818eedb49c88c86d414224b9 (patch) | |
| tree | db30bdc69606bdbb191a422fb2f3a8cc9484352b /external/python3 | |
| parent | 6e18734c5c3b026669da89b2b535383eccd4c083 (diff) | |
use --binary flag when applying patches with patch from git-bash
Change-Id: Idbd4ad7ad89dc727e2f0cf851c4c62f05d5b2a0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166328
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'external/python3')
| -rw-r--r-- | external/python3/UnpackedTarball_python3.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk index 6eaa4ca82784..cbb85e14e405 100644 --- a/external/python3/UnpackedTarball_python3.mk +++ b/external/python3/UnpackedTarball_python3.mk @@ -16,6 +16,11 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\ PCbuild/pcbuild.sln \ )) +ifneq ($(MSYSTEM),) +# use binary flag so patch from git-bash won't choke on mixed line-endings in patches +$(eval $(call gb_UnpackedTarball_set_patchflags,python3,--binary)) +endif + $(eval $(call gb_UnpackedTarball_add_patches,python3,\ external/python3/i100492-freebsd.patch.1 \ external/python3/python-3.3.0-darwin.patch.1 \ |