#--------------------------------------------------------
PROG := busybox
MAJOR_VERSION :=1
-MINOR_VERSION :=1
-SUBLEVEL_VERSION:=1
-EXTRAVERSION :=
+MINOR_VERSION :=2
+SUBLEVEL_VERSION:=0
+EXTRAVERSION :=-pre0
VERSION :=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL_VERSION)$(EXTRAVERSION)
BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
# to something more interesting... Target architecture is determined
# by asking the CC compiler what arch it compiles things for, so unless
# your compiler is broken, you should not need to specify TARGET_ARCH
-CROSS =$(subst ",, $(strip $(CROSS_COMPILER_PREFIX)))
+CROSS =$(strip $(subst ",, $(strip $(CROSS_COMPILER_PREFIX))))
+# be gentle to vi coloring.. "))
CC = $(CROSS)gcc
AR = $(CROSS)ar
AS = $(CROSS)as
LD = $(CROSS)ld
NM = $(CROSS)nm
STRIP = $(CROSS)strip
+ELF2FLT = $(CROSS)elf2flt
CPP = $(CC) -E
SED ?= sed
+BZIP2 ?= bzip2
# What OS are you compiling busybox for? This allows you to include
# OS specific things, syscall overrides, etc.
TARGET_OS=linux
-# Select the compiler needed to build binaries for your development system
-HOSTCC = gcc
-HOSTCFLAGS= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
-
# Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc.
LC_ALL:= C
# especially from the command line, use this instead of CFLAGS directly.
# For optimization overrides, it's better still to set OPTIMIZATION.
CFLAGS_EXTRA=$(subst ",, $(strip $(EXTRA_CFLAGS_OPTIONS)))
+# be gentle to vi coloring.. ")
# To compile vs some other alternative libc, you may need to use/adjust
# the following lines to meet your needs...
#LDFLAGS+=-nostdlib
#LIBRARIES:=$(LIBCDIR)/lib/libc.a -lgcc
#CROSS_CFLAGS+=-nostdinc -I$(LIBCDIR)/include -I$(GCCINCDIR) -funsigned-char
-#GCCINCDIR:=$(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp")
-
-WARNINGS=-Wall -Wstrict-prototypes -Wshadow
-CFLAGS+=-I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)
+#GCCINCDIR:=$(shell gcc -print-search-dirs | $(SED) -ne "s/install: \(.*\)/\1include/gp")
+# This must bind late because srcdir is reset for every source subdirectory.
+INCS:=-I$(top_builddir)/include -I$(top_srcdir)/include
+CFLAGS=$(INCS) -I$(srcdir) -D_GNU_SOURCE
+CFLAGS+=$(CHECKED_CFLAGS)
ARFLAGS=cru
-
# gcc centric. Perhaps fiddle with findstring gcc,$(CC) for the rest
# get the CC MAJOR/MINOR version
CC_MAJOR:=$(shell printf "%02d" $(shell echo __GNUC__ | $(CC) -E -xc - | tail -n 1))
#--------------------------------------------------------
export VERSION BUILDTIME HOSTCC HOSTCFLAGS CROSS CC AR AS LD NM STRIP CPP
ifeq ($(strip $(TARGET_ARCH)),)
-TARGET_ARCH:=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \
+TARGET_ARCH:=$(shell $(CC) -dumpmachine | $(SED) -e s'/-.*//' \
-e 's/i.86/i386/' \
-e 's/sparc.*/sparc/' \
-e 's/arm.*/arm/g' \
)
endif
-# A nifty macro to make testing gcc features easier
-check_gcc=$(shell \
- if [ "$(1)" != "" ]; then \
- if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
- then echo "$(1)"; else echo "$(2)"; fi \
+# A nifty macro to make testing gcc features easier, but note that everything
+# that uses this _must_ use := or it will be re-evaluated everytime it is
+# referenced.
+ifeq ($(strip $(BUILD_VERBOSE)),2)
+VERBOSE_CHECK_CC=echo CC=\"$(1)\" check_cc $(2) >&2;
+endif
+check_cc=$(shell \
+ $(VERBOSE_CHECK_CC) \
+ if [ "x$(1)" != "x" ] && [ "x$(2)" != "x" ]; then \
+ echo "int i;" > ./conftest.c; \
+ if $(1) $(2) -c -o conftest.o conftest.c > /dev/null 2>&1; \
+ then echo "$(2)"; else echo "$(3)"; fi ; \
+ rm -f conftest.c conftest.o; \
fi)
+ifneq ($(filter $(nocheck_targets),$(MAKECMDGOALS)),)
+check_cc:=
+endif
+
# A not very robust macro to check for available ld flags
+ifeq ($(strip $(BUILD_VERBOSE)),2)
+VERBOSE_CHECK_LD=echo LD=\"$(1)\" check_ld $(2) >&2;
+endif
check_ld=$(shell \
- if [ "x$(1)" != "x" ]; then \
- $(LD) --help | grep -q "\$(1)" && echo "-Wl,$(1)" ; \
+ $(VERBOSE_CHECK_LD) \
+ if [ "x$(1)" != "x" ] && [ "x$(2)" != "x" ]; then \
+ $(1) -o /dev/null -b binary /dev/null > /dev/null 2>&1 && \
+ echo "-Wl,$(2)" ; \
fi)
-CFLAGS+=$(call check_gcc,-funsigned-char,)
+ifneq ($(filter $(nocheck_targets),$(MAKECMDGOALS)),)
+check_ld:=
+endif
+
+# A not very robust macro to check for available strip flags
+ifeq ($(strip $(BUILD_VERBOSE)),2)
+VERBOSE_CHECK_STRIP=echo STRIPCMD=\"$(1)\" check_strip $(2) >&2;
+endif
+check_strip=$(shell \
+ $(VERBOSE_CHECK_STRIP) \
+ if [ "x$(1)" != "x" ] && [ "x$(2)" != "x" ]; then \
+ echo "int i;" > ./conftest.c ; \
+ $(CC) -c -o conftest.o conftest.c > /dev/null 2>&1 ; \
+ $(1) $(2) conftest.o > /dev/null 2>&1 && \
+ echo "$(1) $(2)" || echo "$(3)"; \
+ rm -f conftest.c conftest.o > /dev/null 2>&1 ; \
+ fi)
+
+ifneq ($(filter $(nocheck_targets),$(MAKECMDGOALS)),)
+check_strip:=
+endif
+
+
+# Select the compiler needed to build binaries for your development system
+HOSTCC = gcc
+HOSTCFLAGS:=$(call check_cc,$(HOSTCC),-Wall,)
+HOSTCFLAGS+=$(call check_cc,$(HOSTCC),-Wstrict-prototypes,)
+HOSTCFLAGS+=$(call check_cc,$(HOSTCC),-O2,)
+HOSTCFLAGS+=$(call check_cc,$(HOSTCC),-fomit-frame-pointer,)
+
+LD_WHOLE_ARCHIVE:=$(shell echo "int i;" > conftest.c ; \
+ $(CC) -c -o conftest.o conftest.c ; \
+ echo "int main(void){return 0;}" > conftest_main.c ; \
+ $(CC) -c -o conftest_main.o conftest_main.c ; \
+ $(AR) $(ARFLAGS) conftest.a conftest.o ; \
+ $(CC) -Wl,--whole-archive conftest.a -Wl,--no-whole-archive \
+ conftest_main.o -o conftest > /dev/null 2>&1 \
+ && echo "-Wl,--whole-archive" ; \
+ rm conftest_main.o conftest_main.c conftest.o conftest.c \
+ conftest.a conftest > /dev/null 2>&1 ; )
+ifneq ($(findstring whole-archive,$(LD_WHOLE_ARCHIVE)),)
+LD_NO_WHOLE_ARCHIVE:= -Wl,--no-whole-archive
+endif
+
+LD_START_GROUP:=$(shell echo "int bar(void){return 0;}" > conftest.c ; \
+ $(CC) -c -o conftest.o conftest.c ; \
+ echo "int main(void){return bar();}" > conftest_main.c ; \
+ $(CC) -c -o conftest_main.o conftest_main.c ; \
+ $(AR) $(ARFLAGS) conftest.a conftest.o ; \
+ $(CC) -Wl,--start-group conftest.a conftest_main.o -Wl,--end-group \
+ -o conftest > /dev/null 2>&1 && echo "-Wl,--start-group" ; \
+ rm conftest_main.o conftest_main.c conftest.o conftest.c \
+ conftest.a conftest > /dev/null 2>&1 ; )
+ifneq ($(findstring start-group,$(LD_START_GROUP)),)
+LD_END_GROUP:= -Wl,--end-group
+endif
+
+CHECKED_LDFLAGS := $(call check_ld,$(LD),--warn-common,)
+
+# Pin CHECKED_CFLAGS with := so it's only evaluated once.
+CHECKED_CFLAGS:=$(call check_cc,$(CC),-Wall,)
+CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wstrict-prototypes,)
+CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wshadow,)
+CHECKED_CFLAGS+=$(call check_cc,$(CC),-funsigned-char,)
+CHECKED_CFLAGS+=$(call check_cc,$(CC),-mmax-stack-frame=256,)
+CHECKED_CFLAGS+=$(call check_cc,$(CC),-fno-builtin-strlen)
+
+# Preemptively pin this too.
+PROG_CFLAGS:=
-CFLAGS+=$(call check_gcc,-mmax-stack-frame=256,)
#--------------------------------------------------------
# Arch specific compiler optimization stuff should go here.
# for OPTIMIZATION...
# use '-Os' optimization if available, else use -O2
-OPTIMIZATION:=$(call check_gcc,-Os,-O2)
+OPTIMIZATION:=$(call check_cc,$(CC),-Os,-O2)
ifeq ($(CONFIG_BUILD_AT_ONCE),y)
# gcc 2.95 exits with 0 for "unrecognized option"
ifeq ($(strip $(shell [ $(CC_MAJOR) -ge 3 ] ; echo $$?)),0)
- CFLAGS_COMBINE:=$(call check_gcc,--combine,)
+ CFLAGS_COMBINE:=$(call check_cc,$(CC),--combine,)
endif
-OPTIMIZATION+=$(call check_gcc,-funit-at-a-time,)
+OPTIMIZATION+=$(call check_cc,$(CC),-funit-at-a-time,)
+OPTIMIZATION+=$(call check_cc,$(CC),-fgcse-after-reload,)
+ifneq ($(CONFIG_BUILD_LIBBUSYBOX),y)
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25795
-#PROG_CFLAGS+=$(call check_gcc,-fwhole-program,)
+# This prevents us from using -fwhole-program when we build the lib
+PROG_CFLAGS+=$(call check_cc,$(CC),-fwhole-program,)
+endif # CONFIG_BUILD_LIBBUSYBOX
endif # CONFIG_BUILD_AT_ONCE
-LIB_LDFLAGS:=$(call check_ld,--enable-new-dtags,)
-#LIB_LDFLAGS+=$(call check_ld,--reduce-memory-overheads,)
-#LIB_LDFLAGS+=$(call check_ld,--as-needed,)
-#LIB_LDFLAGS+=$(call check_ld,--warn-shared-textrel,)
+LIB_LDFLAGS:=$(call check_ld,$(LD),--enable-new-dtags,)
+#LIB_LDFLAGS+=$(call check_ld,$(LD),--reduce-memory-overheads,)
+#LIB_LDFLAGS+=$(call check_ld,$(LD),--as-needed,)
+#LIB_LDFLAGS+=$(call check_ld,$(LD),--warn-shared-textrel,)
# Some nice architecture specific optimizations
OPTIMIZATION+=-fstrict-aliasing
endif
ifeq ($(strip $(TARGET_ARCH)),i386)
- OPTIMIZATION+=$(call check_gcc,-march=i386,)
+ OPTIMIZATION+=$(call check_cc,$(CC),-march=i386,)
# gcc-4.0 and older seem to benefit from these
#ifneq ($(strip $(shell [ $(CC_MAJOR) -ge 4 -a $(CC_MINOR) -ge 1 ] ; echo $$?)),0)
- OPTIMIZATION+=$(call check_gcc,-mpreferred-stack-boundary=2,)
- OPTIMIZATION+=$(call check_gcc,-falign-functions=1 -falign-jumps=1 -falign-loops=1,\
+ OPTIMIZATION+=$(call check_cc,$(CC),-mpreferred-stack-boundary=2,)
+ OPTIMIZATION+=$(call check_cc,$(CC),-falign-functions=1 -falign-jumps=1 -falign-loops=1,\
-malign-functions=0 -malign-jumps=0 -malign-loops=0)
#endif # gcc-4.0 and older
# gcc-4.1 and beyond seem to benefit from these
ifeq ($(strip $(shell [ $(CC_MAJOR) -ge 4 -a $(CC_MINOR) -ge 1 ] ; echo $$?)),0)
# turn off flags which hurt -Os
- OPTIMIZATION+=$(call check_gcc,-fno-tree-loop-optimize,)
- OPTIMIZATION+=$(call check_gcc,-fno-tree-dominator-opts,)
- OPTIMIZATION+=$(call check_gcc,-fno-strength-reduce,)
+ OPTIMIZATION+=$(call check_cc,$(CC),-fno-tree-loop-optimize,)
+ OPTIMIZATION+=$(call check_cc,$(CC),-fno-tree-dominator-opts,)
+ OPTIMIZATION+=$(call check_cc,$(CC),-fno-strength-reduce,)
- OPTIMIZATION+=$(call check_gcc,-fno-branch-count-reg,)
+ OPTIMIZATION+=$(call check_cc,$(CC),-fno-branch-count-reg,)
endif # gcc-4.1 and beyond
endif
-OPTIMIZATIONS:=$(OPTIMIZATION) $(call check_gcc,-fomit-frame-pointer,)
+OPTIMIZATION+=$(call check_cc,$(CC),-fomit-frame-pointer,)
+OPTIMIZATION+=$(call check_cc,$(CC),-ffunction-sections -fdata-sections,)
#
#--------------------------------------------------------
LIBRARIES:=-lefence
endif
endif
+
+# Debugging info
+
ifeq ($(strip $(CONFIG_DEBUG)),y)
- CFLAGS +=$(WARNINGS) -g -D_GNU_SOURCE
- LDFLAGS += $(call check_ld,--warn-common,)
+ CFLAGS +=-g
else
- CFLAGS+=$(WARNINGS) $(OPTIMIZATIONS) -D_GNU_SOURCE -DNDEBUG
- LDFLAGS += $(call check_ld,--warn-common,)
- LDFLAGS += $(call check_ld,--sort-common,)
+ CFLAGS +=-DNDEBUG
+ CHECKED_LDFLAGS += $(call check_ld,$(LD),--sort-common,)
+ CHECKED_LDFLAGS += $(call check_ld,--gc-sections,)
endif
-STRIPCMD:=$(STRIP) -s --remove-section=.note --remove-section=.comment
+
+ifneq ($(strip $(CONFIG_DEBUG_PESSIMIZE)),y)
+ CFLAGS += $(OPTIMIZATION)
+endif
+
+# warn a bit more verbosely for non-release versions
+ifneq ($(EXTRAVERSION),)
+ CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wstrict-prototypes,)
+ CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wmissing-prototypes,)
+ CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wmissing-declarations,)
+ CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wunused,)
+ CHECKED_CFLAGS+=$(call check_cc,$(CC),-Winit-self,)
+ CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wshadow,)
+ CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wcast-align,)
+endif
+STRIPCMD:=$(call check_strip,$(STRIP),-s --remove-section=.note --remove-section=.comment,$(STRIP))
ifeq ($(strip $(CONFIG_STATIC)),y)
- PROG_CFLAGS += $(call check_gcc,-static,)
+ PROG_CFLAGS += $(call check_cc,$(CC),-static,)
endif
-CFLAGS_SHARED += $(call check_gcc,-shared,)
+CFLAGS_SHARED := $(call check_cc,$(CC),-shared,)
LIB_CFLAGS+=$(CFLAGS_SHARED)
ifeq ($(strip $(CONFIG_BUILD_LIBBUSYBOX)),y)
- CFLAGS_PIC:= $(call check_gcc,-fPIC,)
+ CFLAGS_PIC:= $(call check_cc,$(CC),-fPIC,)
LIB_CFLAGS+=$(CFLAGS_PIC)
endif
-
ifeq ($(strip $(CONFIG_SELINUX)),y)
- SELINUX_INC ?= /usr/include
- SELINUX_LIB ?= /usr/lib
- CFLAGS := -I$(SELINUX_INC) $(CFLAGS)
- LDFLAGS := -L$(SELINUX_LIB) $(LDFLAGS)
- LIBRARIES += -lselinux
+ LIBRARIES += -lselinux
endif
ifeq ($(strip $(PREFIX)),)
PREFIX:=`pwd`/_install
endif
+ifneq ($(strip $(CONFIG_GETOPT_LONG)),y)
+ CFLAGS += -D__need_getopt
+endif
+
# Additional complications due to support for pristine source dir.
# Include files in the build directory should take precedence over
# the copy in top_srcdir, both during the compilation phase and the
OBJECTS:=$(APPLET_SOURCES:.c=.o) busybox.o usage.o applets.o
-CFLAGS += $(CROSS_CFLAGS)
+CFLAGS += $(CHECKED_CFLAGS) $(CROSS_CFLAGS)
+LDFLAGS += $(CHECKED_LDFLAGS)
+
ifdef BB_INIT_SCRIPT
CFLAGS += -DINIT_SCRIPT='"$(BB_INIT_SCRIPT)"'
endif
DISP := sil
Q := @
else
-ifneq ($(V)$(VERBOSE),)
+ifneq ($(BUILD_VERBOSE),)
SECHO := @-false
DISP := ver
Q :=
pur_disp_compile.h = echo " "HOSTCC $(show_objs)
pur_disp_strip = echo " "STRIP $(show_objs)
pur_disp_link = echo " "LINK $(show_objs)
+pur_disp_link.h = echo " "HOSTLINK $(show_objs)
pur_disp_ar = echo " "AR $(ARFLAGS) $(show_objs)
+pur_disp_elf2flt = echo " "ELF2FLT $(ELF2FLTFLAGS) $(show_objs)
sil_disp_compile.c = true
sil_disp_compile.h = true
sil_disp_strip = true
sil_disp_link = true
+sil_disp_link.h = true
sil_disp_ar = true
+sil_disp_elf2flt = true
ver_disp_compile.c = echo $(cmd_compile.c)
ver_disp_compile.h = echo $(cmd_compile.h)
ver_disp_strip = echo $(cmd_strip)
ver_disp_link = echo $(cmd_link)
+ver_disp_link.h = echo $(cmd_link.h)
ver_disp_ar = echo $(cmd_ar)
+ver_disp_elf2flt = echo $(cmd_elf2flt)
disp_compile.c = $($(DISP)_disp_compile.c)
disp_compile.h = $($(DISP)_disp_compile.h)
disp_strip = $($(DISP)_disp_strip)
disp_link = $($(DISP)_disp_link)
+disp_link.h = $($(DISP)_disp_link.h)
disp_ar = $($(DISP)_disp_ar)
disp_gen = $(SECHO) " "GEN $@ ; true
disp_doc = $(SECHO) " "DOC $(subst docs/,,$@) ; true
+disp_elf2flt = $($(DISP)_disp_elf2flt)
cmd_compile.c = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
-cmd_compile.h = $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $<
+cmd_compile.h = $(HOSTCC) $(HOSTCFLAGS) $(INCS) -c -o $@ $<
cmd_strip = $(STRIPCMD) $@
-cmd_link = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS)
+cmd_link = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) \
+ $(PROG_CFLAGS) $(PROG_LDFLAGS) $(CFLAGS_COMBINE) \
+ -o $@ $(LD_START_GROUP) \
+ $(APPLETS_DEFINE) $(APPLET_SRC) \
+ $(BUSYBOX_DEFINE) $(BUSYBOX_SRC) $(libraries-y) \
+ $(LDBUSYBOX) $(LIBRARIES) \
+ $(LD_END_GROUP)
+cmd_link.so = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) \
+ $(LIB_CFLAGS) $(CFLAGS_COMBINE) $(LIB_LDFLAGS) \
+ -o $(@) $(LD_START_GROUP) $(LD_WHOLE_ARCHIVE) \
+ $(LIBRARY_DEFINE) $(^) \
+ $(LD_NO_WHOLE_ARCHIVE) $(LD_END_GROUP)
+cmd_link.h = $(HOSTCC) $(HOSTCFLAGS) $(INCS) $< -o $@
cmd_ar = $(AR) $(ARFLAGS) $@ $^
+cmd_elf2flt = $(ELF2FLT) $(ELF2FLTFLAGS) $< -o $@
compile.c = @$(disp_compile.c) ; $(cmd_compile.c)
compile.h = @$(disp_compile.h) ; $(cmd_compile.h)
do_strip = @$(disp_strip) ; $(cmd_strip)
do_link = @$(disp_link) ; $(cmd_link)
+do_link.so = @$(disp_link) ; $(cmd_link.so)
+do_link.h = @$(disp_link.h) ; $(cmd_link.h)
do_ar = @$(disp_ar) ; $(cmd_ar)
+do_elf2flt = @$(disp_elf2flt) ; $(cmd_elf2flt)
+
+uppercase = $(shell echo $1 | $(SED) -e "y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/")
+%.a:
+ @if test -z "$($(call uppercase,$*)_DIR)" ; then \
+ echo "Invalid target $@" ; \
+ exit 1 ; \
+ fi
+ $(Q)$(MAKE) $($(call uppercase,$*)_DIR)$@
.PHONY: dummy
projects / oweals / busybox.git / blobdiff