[patch] fix compilation of bbconfig
Bernhard Fischer
rep.nop at aon.at
Sat Sep 17 17:22:28 UTC 2005
Hi,
vodz' recent changes to the dependencies of .depend removed the
unconditial generation of bbconfigopts.h
Currently, allyesconfig is broken as bbconfigopts.h needed by bbconfig
is never generated.
Either we remove bbconfig or conditionally generate it only if the
applet is selected.
The attached patchlet does the latter, please apply if we're not going
to do the former :)
thanks,
Bernhard
-------------- next part --------------
diff -X excl -rduNp busybox.oorig/Makefile busybox/Makefile
--- busybox.oorig/Makefile 2005-09-12 20:54:50.000000000 +0200
+++ busybox/Makefile 2005-09-17 18:58:59.000000000 +0200
@@ -202,10 +202,6 @@ include/bb_config.h: include/config.h
< $< >> $@
@echo "#endif" >> $@
-include/bbconfigopts.h: .config
- @[ -d $(@D) ] || mkdir -v $(@D)
- $(top_srcdir)/scripts/config/mkconfigs >include/bbconfigopts.h
-
finished2:
$(SECHO)
$(SECHO) Finished installing...
diff -X excl -rduNp busybox.oorig/miscutils/Makefile.in busybox/miscutils/Makefile.in
--- busybox.oorig/miscutils/Makefile.in 2005-09-15 22:00:43.000000000 +0200
+++ busybox/miscutils/Makefile.in 2005-09-17 19:04:31.000000000 +0200
@@ -45,6 +45,12 @@ MISCUTILS-$(CONFIG_WATCHDOG) += watch
libraries-y+=$(MISCUTILS_DIR)$(MISCUTILS_AR)
+
+
+$(top_builddir)/include/bbconfigopts.h: $(top_builddir)/.config
+ @[ -d $(@D) ] || mkdir -v $(@D)
+ $(top_srcdir)/scripts/config/mkconfigs > $(top_builddir)/include/bbconfigopts.h
+
needlibm-y:=
needlibm-$(CONFIG_DC) := y
@@ -58,3 +64,6 @@ $(MISCUTILS_DIR)$(MISCUTILS_AR): $(patsu
$(MISCUTILS_DIR)%.o: $(srcdir)/%.c
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+
+$(MISCUTILS_DIR)bbconfig.o: $(srcdir)/bbconfig.c $(top_builddir)/include/bbconfigopts.h
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
More information about the busybox
mailing list