jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-31 15:07:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

proftpd: breaks with parallel builds

Browse Source 
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>
This commit is contained in:
Peter Korsgaard 2010-08-29 21:48:34 +02:00
parent c06b3891ff
commit 6ef440ba0d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -18,8 +18,8 @@
fs: old-style squashfs for big endian archs fixed. fs: old-style squashfs for big endian archs fixed.
Updated/fixed packages: busybox, imagemagick, libglib2, lua, Updated/fixed packages: busybox, imagemagick, libglib2, lua,
luafilesystem, lzo, netcat, php, qt, samba, startup-notification, luafilesystem, lzo, netcat, php, proftpd, qt, samba,
sysvinit, util-linux startup-notification, sysvinit, util-linux
Issues resolved (http://bugs.uclibc.org): Issues resolved (http://bugs.uclibc.org):

4
package/proftpd/proftpd.mk
View File

@ -52,9 +52,9 @@ $(PROFTPD_DIR)/.configured: $(PROFTPD_DIR)/.unpacked
touch $@ touch $@
$(PROFTPD_DIR)/$(PROFTPD_BINARY): $(PROFTPD_DIR)/.configured $(PROFTPD_DIR)/$(PROFTPD_BINARY): $(PROFTPD_DIR)/.configured
$(MAKE) CC="$(HOSTCC)" CFLAGS="" LDFLAGS="" \ $(MAKE1) CC="$(HOSTCC)" CFLAGS="" LDFLAGS="" \
-C $(PROFTPD_DIR)/lib/libcap _makenames -C $(PROFTPD_DIR)/lib/libcap _makenames
$(MAKE) -C $(PROFTPD_DIR) $(MAKE1) -C $(PROFTPD_DIR)
$(TARGET_DIR)/$(PROFTPD_TARGET_BINARY): $(PROFTPD_DIR)/$(PROFTPD_BINARY) $(TARGET_DIR)/$(PROFTPD_TARGET_BINARY): $(PROFTPD_DIR)/$(PROFTPD_BINARY)
cp -dpf $(PROFTPD_DIR)/$(PROFTPD_BINARY) \ cp -dpf $(PROFTPD_DIR)/$(PROFTPD_BINARY) \