4a5d95d3f
"Vladimir N. Oleynik"
2005-09-19
Subject
corect build bbconfig applet, Thanks, Bernhard Fischer
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
Makefile+2 -6
| @@ -70,7 +70,7 @@ $(filter-out _all,$(MAKECMDGOALS)) _all: $(KBUILD_OUTPUT)/Rules.mak $(KBUILD_OUT | |
| $(MAKE) -C $(KBUILD_OUTPUT) \ | |
| top_srcdir=$(CURDIR) \ | |
| top_builddir=$(KBUILD_OUTPUT) \ | |
| - | TOPDIR=$(KBUILD_OUTPUT) \ |
| + | TOPDIR=$(KBUILD_OUTPUT) \ |
| KBUILD_SRC=$(CURDIR) \ | |
| -f $(CURDIR)/Makefile $@ | |
| @@ -100,7 +100,7 @@ ifeq ($(strip $(HAVE_DOT_CONFIG)),y) | |
| all: busybox busybox.links doc | |
| - | all_tree: $(ALL_MAKEFILES) |
| + | all_tree: $(ALL_MAKEFILES) |
| $(ALL_MAKEFILES): %/Makefile: $(top_srcdir)/%/Makefile | |
| [ -d $(@D) ] || mkdir -p $(@D); cp $< $@ | |
| @@ -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... | |
miscutils/Makefile.in+7 -2
| @@ -33,9 +33,9 @@ MISCUTILS-$(CONFIG_DEVFSD) += devfsd.o | |
| MISCUTILS-$(CONFIG_EJECT) += eject.o | |
| MISCUTILS-$(CONFIG_HDPARM) += hdparm.o | |
| MISCUTILS-$(CONFIG_LAST) += last.o | |
| - | MISCUTILS-${CONFIG_LESS} += less.o |
| + | MISCUTILS-${CONFIG_LESS} += less.o |
| MISCUTILS-$(CONFIG_MAKEDEVS) += makedevs.o | |
| - | MISCUTILS-$(CONFIG_MOUNTPOINT) += mountpoint.o |
| + | MISCUTILS-$(CONFIG_MOUNTPOINT) += mountpoint.o |
| MISCUTILS-$(CONFIG_MT) += mt.o | |
| MISCUTILS-$(CONFIG_RX) += rx.o | |
| MISCUTILS-$(CONFIG_SETSID) += setsid.o | |
| @@ -55,6 +55,11 @@ endif | |
| $(MISCUTILS_DIR)$(MISCUTILS_AR): $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y)) | |
| $(AR) $(ARFLAGS) $@ $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y)) | |
| + | include/bbconfigopts.h: $(top_builddir)/.config |
| + | $(top_builddir)/scripts/config/mkconfigs >include/bbconfigopts.h |
| + | |
| + | $(MISCUTILS_DIR)bbconfig.o: include/bbconfigopts.h |
| + | |
| $(MISCUTILS_DIR)%.o: $(srcdir)/%.c | |
| $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< | |