gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mtd-utils: buildsystem is broken with parallel make (regarding libubi) 

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2010-05-19 23:11:57 +02:00
parent 8272501ea0
commit f3122259e2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -2,7 +2,7 @@
Fixes all over the tree. Fixes all over the tree.
Updated/fixed packages: avahi, busybox Updated/fixed packages: avahi, busybox, mtd-utils
2010.05-rc2, Released May 11th, 2010: 2010.05-rc2, Released May 11th, 2010:

8
package/mtd/mtd.mk
View File

@ -14,12 +14,12 @@ HOST_MTD_DEPENDENCIES = host-zlib host-lzo host-e2fsprogs
define HOST_MTD_BUILD_CMDS define HOST_MTD_BUILD_CMDS
CC="$(HOSTCC)" CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \ CC="$(HOSTCC)" CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \
CROSS= $(MAKE) BUILDDIR=$(@D) \ CROSS= $(MAKE1) BUILDDIR=$(@D) \
WITHOUT_XATTR=1 -C $(@D) WITHOUT_XATTR=1 -C $(@D)
endef endef
define HOST_MTD_INSTALL_CMDS define HOST_MTD_INSTALL_CMDS
$(MAKE) BUILDDIR=$(@D) DESTDIR=$(HOST_DIR) -C $(@D) install $(MAKE1) BUILDDIR=$(@D) DESTDIR=$(HOST_DIR) -C $(@D) install
endef endef
MKFS_JFFS2=$(HOST_DIR)/usr/sbin/mkfs.jffs2 MKFS_JFFS2=$(HOST_DIR)/usr/sbin/mkfs.jffs2
@ -71,7 +71,7 @@ MTD_MAKE_COMMON_FLAGS = \
ifneq ($(MTD_TARGETS_y),) ifneq ($(MTD_TARGETS_y),)
define MTD_TARGETS_BUILD define MTD_TARGETS_BUILD
$(MAKE) $(MTD_MAKE_COMMON_FLAGS) \ $(MAKE1) $(MTD_MAKE_COMMON_FLAGS) \
BUILDDIR=$(@D) \ BUILDDIR=$(@D) \
-C $(@D) \ -C $(@D) \
$(addprefix $(@D)/, $(MTD_TARGETS_y)) $(addprefix $(@D)/, $(MTD_TARGETS_y))
@ -80,7 +80,7 @@ endif
ifneq ($(MTD_TARGETS_UBI_y),) ifneq ($(MTD_TARGETS_UBI_y),)
define MTD_TARGETS_UBI_BUILD define MTD_TARGETS_UBI_BUILD
$(MAKE) $(MTD_MAKE_COMMON_FLAGS) \ $(MAKE1) $(MTD_MAKE_COMMON_FLAGS) \
BUILDDIR=$(@D)/ubi-utils/ \ BUILDDIR=$(@D)/ubi-utils/ \
-C $(@D)/ubi-utils \ -C $(@D)/ubi-utils \
$(addprefix $(@D)/ubi-utils/, $(MTD_TARGETS_UBI_y)) $(addprefix $(@D)/ubi-utils/, $(MTD_TARGETS_UBI_y))