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/coinmp | |
| 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/coinmp')
| -rw-r--r-- | external/coinmp/UnpackedTarball_coinmp.mk | 5 |
1 files changed, 5 insertions, 0 deletions
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 # <https://list.coin-or.org/pipermail/coin-discuss/2020-February/003972.html> "[Coin-discuss] # Small patch to fix Clang -Wnon-c-typedef-for-linkage in Clp": |