[git commit master 1/1] fix compile breakage with "make -j"

Denys Vlasenko vda.linux at googlemail.com
Sat Jul 3 12:28:35 UTC 2010


commit: http://git.busybox.net/busybox/commit/?id=5c296de390b1329a6243d12a86ef9c4726ace22a
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 Makefile          |    2 ++
 libbb/Kbuild.src  |    2 ++
 libbb/appletlib.c |    2 +-
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 9a82776..ef7c532 100644
--- a/Makefile
+++ b/Makefile
@@ -512,6 +512,8 @@ include $(srctree)/Makefile.flags
 include/autoconf.h: .kconfig.d .config $(wildcard $(srctree)/*/*.c) $(wildcard $(srctree)/*/*/*.c) | gen_build_files
 	$(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig
 
+include/usage.h: gen_build_files
+
 else
 # Dummy target needed, because used as prerequisite
 include/autoconf.h: ;
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 29c136c..cb1f8e9 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -4,6 +4,8 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
+libbb/appletlib.o: include/usage_compressed.h
+
 lib-y:=
 
 INSERT
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 58f1a94..6f058bc 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -65,7 +65,7 @@ static const char usage_messages[] ALIGN1 = UNPACKED_USAGE;
 
 #if ENABLE_FEATURE_COMPRESS_USAGE
 
-static const char packed_usage[] = { PACKED_USAGE };
+static const char packed_usage[] ALIGN1 = { PACKED_USAGE };
 # include "unarchive.h"
 static const char *unpack_usage_messages(void)
 {
-- 
1.7.1



More information about the busybox-cvs mailing list