diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-08-29 21:48:34 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-08-29 21:51:07 +0200 |
| commit | 6ef440ba0d1a0754c07db26ddb77ab81a0d401de (patch) | |
| tree | 8030680db2dd1b1a029f34a5a5bc41a00496cca4 | |
| parent | c06b3891ff9ff2f6780e7547a54d2688dafa016c (diff) | |
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>
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | package/proftpd/proftpd.mk | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -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 7404d8319..11ef1ef85 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) \ |