From: Felix Fietkau <nbd@openwrt.org>
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-Tag: reboot~18542
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b34a0b3282e9effa31888c2e6bdc79d53dfe9c81;p=openwrt%2Fopenwrt.git

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

SVN-Revision: 23743
---

diff --git a/rules.mk b/rules.mk
index 007e5bc9b2..3bd6073fb7 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