From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 29 Aug 2010 19:48:34 +0000 (+0200)
Subject: proftpd: breaks with parallel builds
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6ef440ba0d1a0754c07db26ddb77ab81a0d401de;p=buildroot.git

proftpd: breaks with parallel builds

The proftpd build system has a race condition, which may break the build
with high -j<level> values (libsupp.a isn't built by the time it is needed).

Fix it by using MAKE1 instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---

diff --git a/CHANGES b/CHANGES
index e68adf0003..5d0b940a85 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,8 +18,8 @@
 	fs: old-style squashfs for big endian archs fixed.
 
 	Updated/fixed packages: busybox, imagemagick, libglib2, lua,
-	luafilesystem, lzo, netcat, php, qt, samba, startup-notification,
-	sysvinit, util-linux
+	luafilesystem, lzo, netcat, php, proftpd, qt, samba,
+	startup-notification, sysvinit, util-linux
 
 	Issues resolved (http://bugs.uclibc.org):
 
diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index 7404d83192..11ef1ef852 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -52,9 +52,9 @@ $(PROFTPD_DIR)/.configured: $(PROFTPD_DIR)/.unpacked
 	touch $@
 
 $(PROFTPD_DIR)/$(PROFTPD_BINARY): $(PROFTPD_DIR)/.configured
-	$(MAKE) CC="$(HOSTCC)" CFLAGS="" LDFLAGS="" \
+	$(MAKE1) CC="$(HOSTCC)" CFLAGS="" LDFLAGS="" \
 		-C $(PROFTPD_DIR)/lib/libcap _makenames
-	$(MAKE) -C $(PROFTPD_DIR)
+	$(MAKE1) -C $(PROFTPD_DIR)
 
 $(TARGET_DIR)/$(PROFTPD_TARGET_BINARY): $(PROFTPD_DIR)/$(PROFTPD_BINARY)
 	cp -dpf $(PROFTPD_DIR)/$(PROFTPD_BINARY) \