浏览代码

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>
Peter Korsgaard 15 年之前
父节点
当前提交
6ef440ba0d
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      CHANGES
  2. 2 2
      package/proftpd/proftpd.mk

+ 2 - 2
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):
 

+ 2 - 2
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) \