From c1256034ffb585cd818eedb49c88c86d414224b9 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Tue, 8 Aug 2023 12:13:53 +0200 Subject: 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 --- external/coinmp/UnpackedTarball_coinmp.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'external/coinmp') diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk index 83ebfca80193..20cf9184516e 100644 --- a/external/coinmp/UnpackedTarball_coinmp.mk +++ b/external/coinmp/UnpackedTarball_coinmp.mk @@ -29,6 +29,11 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,coinmp,\ Osi \ )) +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,coinmp,--binary)) +endif + # * external/coinmp/Wnon-c-typedef-for-linkage.patch upstream at # "[Coin-discuss] # Small patch to fix Clang -Wnon-c-typedef-for-linkage in Clp": -- cgit