aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2020-04-01 17:48:04 -0600
committerJason A. Donenfeld <Jason@zx2c4.com>2020-04-01 22:05:24 -0600
commitc1e86acb3c41f5f2d6ce0107d1a8be951f2f3595 (patch)
treec3072aaff8b68fc46e342b531ee290f6a0abcbdc
parentbuild: update fragment to 1.2.4 (diff)
downloadwireguard-android-c1e86acb3c41f5f2d6ce0107d1a8be951f2f3595.tar.xz
wireguard-android-c1e86acb3c41f5f2d6ce0107d1a8be951f2f3595.zip
tunnel: libwg-go: remove -x option from flock
It's already the default and the macOS port of flock doesn't support it. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--README.md2
-rw-r--r--tunnel/tools/libwg-go/Makefile4
2 files changed, 4 insertions, 2 deletions
diff --git a/README.md b/README.md
index bdad7f5..875e291 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,8 @@ $ cd wireguard-android
$ ./gradlew assembleRelease
```
+macOS users may need [flock(1)](https://github.com/discoteq/flock).
+
## Embedding
The tunnel library is [on JCenter](https://bintray.com/wireguard/wireguard-android/wireguard-android/_latestVersion), alongside [extensive class library documentation](https://javadoc.io/doc/com.wireguard.android/tunnel).
diff --git a/tunnel/tools/libwg-go/Makefile b/tunnel/tools/libwg-go/Makefile
index 44e7c2b..1a83959 100644
--- a/tunnel/tools/libwg-go/Makefile
+++ b/tunnel/tools/libwg-go/Makefile
@@ -30,7 +30,7 @@ default: $(DESTDIR)/libwg-go.so
$(GRADLE_USER_HOME)/caches/golang/$(GO_TARBALL):
mkdir -p "$(dir $@)"
- flock -x "$@.lock" -c ' \
+ flock "$@.lock" -c ' \
[ -f "$@" ] && exit 0; \
curl -o "$@.tmp" "https://dl.google.com/go/$(GO_TARBALL)" && \
echo "$(GO_HASH_$(GO_PLATFORM)) $@.tmp" | sha256sum -c && \
@@ -38,7 +38,7 @@ $(GRADLE_USER_HOME)/caches/golang/$(GO_TARBALL):
$(BUILDDIR)/go-$(GO_VERSION)/.prepared: $(GRADLE_USER_HOME)/caches/golang/$(GO_TARBALL)
mkdir -p "$(dir $@)"
- flock -x "$@.lock" -c ' \
+ flock "$@.lock" -c ' \
[ -f "$@" ] && exit 0; \
tar -C "$(dir $@)" --strip-components=1 -xzf "$^" && \
patch -p1 -f -N -r- -d "$(dir $@)" < goruntime-boottime-over-monotonic.diff && \