8c7a7e6e6
Bernhard Reutner-Fischer
2005-10-13
Subject
- split VERSION into parts - add some filesystem operation wrapper variables for use in the makefiles and pull them in early in the toplevel makefile - use the cross-toolchain for "make sizes"
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+6 -1
| @@ -53,6 +53,11 @@ else | |
| KBUILD_OUTPUT := $(top_builddir) | |
| endif | |
| + | ifneq ($(strip $(HAVE_DOT_CONFIG)),y) |
| + | # pull in OS specific commands like cp, mkdir, etc. early |
| + | -include $(top_srcdir)/Rules.mak |
| + | endif |
| + | |
| # All object directories. | |
| OBJ_DIRS := $(DIRS) | |
| all_tree := $(patsubst %,$(top_builddir)/%,$(OBJ_DIRS) scripts scripts/config include) | |
| @@ -252,7 +257,7 @@ sizes: | |
| -rm -f busybox | |
| $(MAKE) top_srcdir=$(top_srcdir) top_builddir=$(top_builddir) \ | |
| -f $(top_srcdir)/Makefile STRIPCMD=/bin/true | |
| - | nm --size-sort busybox |
| + | $(NM) --size-sort busybox |
| # Documentation Targets | |
| doc: docs/busybox.pod docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html | |
Rules.mak+14 -1
| @@ -19,7 +19,11 @@ | |
| #-------------------------------------------------------- | |
| PROG := busybox | |
| - | VERSION := 1.1.0-pre1 |
| + | MAJOR_VERSION :=1 |
| + | MINOR_VERSION :=1 |
| + | SUBLEVEL_VERSION:=0 |
| + | EXTRAVERSION :=-pre1 |
| + | VERSION :=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL_VERSION)$(EXTRAVERSION) |
| BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z") | |
| @@ -43,6 +47,15 @@ NM = $(CROSS)nm | |
| STRIP = $(CROSS)strip | |
| CPP = $(CC) -E | |
| # MAKEFILES = $(top_builddir)/.config | |
| + | RM = rm |
| + | RM_F = $(RM) -f |
| + | LN = ln |
| + | LN_S = $(LN) -s |
| + | MKDIR = mkdir |
| + | MKDIR_P = $(MKDIR) -p |
| + | MV = mv |
| + | CP = cp |
| + | |
| # What OS are you compiling busybox for? This allows you to include | |
| # OS specific things, syscall overrides, etc. | |