diff options
| author | Roman I Khimov <khimov@altell.ru> | 2009-02-17 18:36:27 +0300 |
|---|---|---|
| committer | Tom Rini <trini@embeddedalley.com> | 2009-02-17 11:48:57 -0500 |
| commit | 58c556d90552178c7221d903bf2077dcda0327fc (patch) | |
| tree | 26bda40e5cde1d817f49ea33c777630b4c7546a0 | |
| parent | 759542d7c98a220db6ab4a76556237ef734a5129 (diff) | |
busybox-1.13.2: fix parallel build failing on appletlib
libbb/appletlib.o depends on generated headers, build can fail with
libbb/appletlib.c:53:27: error: applet_tables.h: No such file or directory
if that dependency is not taken into account
| -rw-r--r-- | packages/busybox/busybox-1.13.2/busybox-appletlib-dependency.patch | 11 | ||||
| -rw-r--r-- | packages/busybox/busybox_1.13.2.bb | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/packages/busybox/busybox-1.13.2/busybox-appletlib-dependency.patch b/packages/busybox/busybox-1.13.2/busybox-appletlib-dependency.patch new file mode 100644 index 0000000000..85a61e8cf5 --- /dev/null +++ b/packages/busybox/busybox-1.13.2/busybox-appletlib-dependency.patch @@ -0,0 +1,11 @@ +--- a/libbb/Kbuild 2008-11-09 20:28:09.000000000 +0300 ++++ b/libbb/Kbuild 2009-02-17 17:41:48.718747865 +0300 +@@ -147,3 +147,8 @@ lib-$(CONFIG_PGREP) += xregcomp.o + lib-$(CONFIG_PKILL) += xregcomp.o + lib-$(CONFIG_DEVFSD) += xregcomp.o + lib-$(CONFIG_FEATURE_FIND_REGEX) += xregcomp.o ++ ++libbb/appletlib.o: include/usage_compressed.h include/applet_tables.h ++ ++include/usage_compressed.h include/applet_tables.h: ++ $(Q)$(MAKE) $(build)=applets $@ diff --git a/packages/busybox/busybox_1.13.2.bb b/packages/busybox/busybox_1.13.2.bb index e8f37a002b..cc2cb2b39e 100644 --- a/packages/busybox/busybox_1.13.2.bb +++ b/packages/busybox/busybox_1.13.2.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r15" +PR = "r16" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ @@ -13,6 +13,7 @@ SRC_URI = "\ file://udhcpc-fix-nfsroot.patch;patch=1 \ file://B921600.patch;patch=1 \ file://get_header_tar.patch;patch=1 \ + file://busybox-appletlib-dependency.patch;patch=1 \ file://find-touchscreen.sh \ file://busybox-cron \ file://busybox-httpd \ |