From d6f6ddfe7c1c22df0f1d1b5961e1d9c69810bbac Mon Sep 17 00:00:00 2001 From: daladim Date: Sun, 14 Jun 2020 14:51:48 +0200 Subject: [PATCH 1/2] [fixup 10a0f75] Depending on how Cygwin is set up, we may (or not) want the --binary switch to patch The Makefile is now able to do both --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f69929c..e00b3d0 100644 --- a/Makefile +++ b/Makefile @@ -103,7 +103,11 @@ $(Status)/config: $(Status)/patch touch $(Status)/config $(Status)/patch: $(Status)/clone - cd $(SrcDir)/sshfs && for f in $(PrjDir)/patches/*.patch; do patch --binary -p1 <$$f; done + cd $(SrcDir)/sshfs && \ + for f in $(PrjDir)/patches/*.patch; do \ + patch -p1 <$$f >/dev/null || \ + patch -p1 --binary <$$f; \ + done touch $(Status)/patch $(Status)/clone: From 7ea9025cb0962875d9d72b9decb440e2c3aa4cd3 Mon Sep 17 00:00:00 2001 From: daladim Date: Sun, 14 Jun 2020 14:56:57 +0200 Subject: [PATCH 2/2] README: added a warning about conflicting Windows/Cygwin programs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 23e7459..6c0ad13 100644 --- a/README.md +++ b/README.md @@ -176,7 +176,7 @@ This is a simple project: In order to build SSHFS-Win you will need Cygwin and the following Cygwin packages: - gcc-core -- git +- git (warning: also having git-for-windows installed in your regular Windows installation can lead to unexpected errors from `git`) - libglib2.0-devel - make - meson