From 9c74ea2cbbe8ac12dea4c3de4470b4c107963b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Tue, 30 Nov 2021 13:53:00 -0500 Subject: [PATCH] contrib: fix build without flock Change-Id: I274ed5b9b6f97b06e7a355b941f81f86c7816c24 --- contrib/src/main.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/src/main.mak b/contrib/src/main.mak index 1b9cf8c086..fa1557f847 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -352,7 +352,7 @@ HOSTVARS := $(HOSTTOOLS) \ ifeq ($(DISABLE_CONTRIB_DOWNLOADS),TRUE) download_git = $(error Trying to clone $(1) but DISABLE_CONTRIB_DOWNLOADS is TRUE, aborting.) else -download_git = flock "$@.lock" sh -c "\ +download_git = $(FLOCK_PREFIX) sh -c "\ rm -Rf '$(@:.tar.xz=)' && \ $(GIT) clone $(2:%=--branch '%') '$(1)' '$(@:.tar.xz=)' && \ (cd '$(@:.tar.xz=)' && $(GIT) checkout $(3:%= '%')) && \ -- GitLab