cef737f03

"Vladimir N. Oleynik"

2005-09-21

SOURCE BUG Duration: 10s

Subject

moved include/bbconfigopts.h from miscutils to to top Makefile before generate .depend. Remove allyesconfig build problem, noticed by 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)

→ Bu hatanin tam hikayesini ve duzeltme diffini gor

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

Makefile +10 -1 miscutils/Makefile.in +0 -3

Makefile+10 -1

@@ -184,7 +184,16 @@ scripts/bb_mkdep: $(top_srcdir)/scripts/bb_mkdep.c
	$(HOSTCC) $(HOSTCFLAGS) -o $@ $<

	depend dep: .depend
-	.depend: scripts/bb_mkdep include/config.h include/bb_config.h
+
+	DEP_INCLUDES=include/config.h include/bb_config.h
+	ifeq ($(strip $(CONFIG_BBCONFIG)),y)
+	DEP_INCLUDES += include/bbconfigopts.h
+
+	include/bbconfigopts.h: .config
+	scripts/config/mkconfigs > $@
+	endif
+
+	.depend: scripts/bb_mkdep $(DEP_INCLUDES)
	@rm -f .depend
	@mkdir -p include/config
	scripts/bb_mkdep -c include/config.h -c include/bb_config.h > $@

miscutils/Makefile.in+0 -3

@@ -55,9 +55,6 @@ endif
	$(MISCUTILS_DIR)$(MISCUTILS_AR): $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y))
	$(AR) $(ARFLAGS) $@ $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y))

-	$(top_builddir)/include/bbconfigopts.h: $(top_builddir)/.config
-	$(top_builddir)/scripts/config/mkconfigs > $(top_builddir)/include/bbconfigopts.h
-
	$(MISCUTILS_DIR)%.o: $(srcdir)/%.c
	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<