From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 31 Oct 2010 15:33:48 +0000 (+0000)
Subject: fix usage of flock - use the command mode instead of locking a file descriptor to... 
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/a9812d96db410072e609f56a7d866c2efd5d4d9b

fix usage of flock - use the command mode instead of locking a file descriptor to fix build issues on mac os x

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23743 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/rules.mk b/rules.mk
index 007e5bc9b..3bd6073fb 100644
--- a/rules.mk
+++ b/rules.mk
@@ -254,9 +254,10 @@ endef
 # $(2) => The lock name. If not given, the global lock will be used.
 # $(3) => The filedescriptor used for the lock. Defaults to 1023.
 define locked
-    ( $(STAGING_DIR_HOST)/bin/flock -x $(if $(3),$(3),1023) && \
-      $(1) \
-    ) $(if $(3),$(strip $(3)),1023)>$(TMP_DIR)/.$(if $(2),$(strip $(2)),global).flock
+	SHELL= \
+	$(STAGING_DIR_HOST)/bin/flock \
+		$(TMP_DIR)/.$(if $(2),$(strip $(2)),global).flock \
+		-c '$(subst ','\'',$(1))'
 endef
 
 # file extension