Makefile related backports:

10945, 10946 Make compile much, much faster.
10923 big makefile change.  Nervous.
10946, 10991, 10998, 11003 small makefile fixes.

diff --git a/busybox/Makefile b/busybox/Makefile
index 81c59a0897aab9b51501a566f6e8da311a89dc10..048194dea07a52274e4f41553296cce2ed055699 100644 (file)
--- a/busybox/Makefile
+++ b/busybox/Makefile
@@ -34,7 +34,7 @@ ifndef top_builddir
 top_builddir=$(CURDIR)
 endif
 
-srctree=$(top_srcdir)
+export srctree=$(top_srcdir)
 vpath %/Config.in $(srctree)
 
 include $(top_builddir)/Rules.mak
@@ -164,9 +164,9 @@ docs/busybox.pod : $(top_srcdir)/docs/busybox_header.pod $(top_srcdir)/include/u
            cat $(top_srcdir)/docs/busybox_footer.pod ) > docs/busybox.pod
 
 docs/BusyBox.txt: docs/busybox.pod
-       @echo
-       @echo BusyBox Documentation
-       @echo
+       $(SECHO)
+       $(SECHO) BusyBox Documentation
+       $(SECHO)
        -mkdir -p docs
        -pod2text $< > $@
 
@@ -214,9 +214,9 @@ include/config.h: .config
        @$(top_builddir)/scripts/config/conf -o $(CONFIG_CONFIG_IN)
 
 finished2:
-       @echo
-       @echo Finished installing...
-       @echo
+       $(SECHO)
+       $(SECHO) Finished installing...
+       $(SECHO)
 
 else # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 

diff --git a/busybox/Rules.mak b/busybox/Rules.mak
index 1d917c2fa612546d36a37acbc86976b105c066c8..c46855acac844d857dfdbb9ccb0a89f2245cee6b 100644 (file)
--- a/busybox/Rules.mak
+++ b/busybox/Rules.mak
@@ -81,12 +81,12 @@ BB_SRC_DIR=
 
 WARNINGS=-Wall -Wstrict-prototypes -Wshadow
 CFLAGS=-I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)
-ARFLAGS=-r
+ARFLAGS=cru
 
 #--------------------------------------------------------
 export VERSION BUILDTIME TOPDIR 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' \
@@ -109,14 +109,22 @@ endif
 check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
        then echo "$(1)"; else echo "$(2)"; fi)
 
+# Setup some shortcuts so that silent mode is silent like it should be
+ifeq ($(subst s,,$(MAKEFLAGS)),$(MAKEFLAGS))
+export MAKE_IS_SILENT=n
+SECHO=@echo
+else
+export MAKE_IS_SILENT=y
+SECHO=-@false
+endif
+
 #--------------------------------------------------------
 # Arch specific compiler optimization stuff should go here.
 # Unless you want to override the defaults, do not set anything
 # for OPTIMIZATION...
 
 # use '-Os' optimization if available, else use -O2
-OPTIMIZATION=
-OPTIMIZATION=${call check_gcc,-Os,-O2}
+OPTIMIZATION:=${call check_gcc,-Os,-O2}
 
 # Some nice architecture specific optimizations
 ifeq ($(strip $(TARGET_ARCH)),arm)
@@ -158,8 +166,8 @@ ifeq ($(strip $(CONFIG_DEBUG)),y)
     STRIPCMD:=/bin/true -Not_stripping_since_we_are_debugging
 else
     CFLAGS+=$(WARNINGS) $(OPTIMIZATIONS) -D_GNU_SOURCE -DNDEBUG
-    LDFLAGS += -s -Wl,-warn-common
-    STRIPCMD:=$(STRIP) --remove-section=.note --remove-section=.comment
+    LDFLAGS += -Wl,-warn-common
+    STRIPCMD:=$(STRIP) -s --remove-section=.note --remove-section=.comment
 endif
 ifeq ($(strip $(CONFIG_STATIC)),y)
     LDFLAGS += --static
@@ -190,7 +198,3 @@ endif
 CFLAGS += $(CFLAGS_EXTRA)
 
 .PHONY: dummy
-
-
-.EXPORT_ALL_VARIABLES:
-

diff --git a/busybox/applets/Makefile.in b/busybox/applets/Makefile.in
index e31bb6fd915db2659a6c4997691c7542a83b57b6..8a43c79f3eda439fee3d911816fc0fd1be1b3169 100644 (file)
--- a/busybox/applets/Makefile.in
+++ b/busybox/applets/Makefile.in
@@ -29,7 +29,7 @@ APPLET_OBJ:= $(patsubst %.c,$(APPLETS_DIR)%.o, $(APPLET_SRC))
 libraries-y+=$(APPLETS_DIR)$(APPLETS_AR)
 
 $(APPLETS_DIR)$(APPLETS_AR): $(APPLET_OBJ)
-       $(AR) -ro $@ $(APPLET_OBJ)
+       $(AR) $(ARFLAGS) $@ $(APPLET_OBJ)
 
 $(APPLET_OBJ): $(top_builddir)/.config
 $(APPLET_OBJ): $(APPLETS_DIR)%.o: $(srcdir)/%.c

diff --git a/busybox/archival/Makefile.in b/busybox/archival/Makefile.in
index 76ab6cd082364bbb07b22c6d4fc81ba87945bce6..dd399e1e7e169472cc17c81d681a6e37cb6cb196 100644 (file)
--- a/busybox/archival/Makefile.in
+++ b/busybox/archival/Makefile.in
@@ -41,7 +41,7 @@ ARCHIVAL-$(CONFIG_UNZIP)      += unzip.o
 libraries-y+=$(ARCHIVAL_DIR)$(ARCHIVAL_AR)
 
 $(ARCHIVAL_DIR)$(ARCHIVAL_AR): $(patsubst %,$(ARCHIVAL_DIR)%, $(ARCHIVAL-y))
-       $(AR) -ro $@ $(patsubst %,$(ARCHIVAL_DIR)%, $(ARCHIVAL-y))
+       $(AR) $(ARFLAGS) $@ $(patsubst %,$(ARCHIVAL_DIR)%, $(ARCHIVAL-y))
 
 $(ARCHIVAL_DIR)%.o: $(srcdir)/%.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<

diff --git a/busybox/archival/libunarchive/Makefile.in b/busybox/archival/libunarchive/Makefile.in
index 809b0e10e58f7a2e290f31f92f11760c11f12183..c0464c72b8434fe23b8bcb574bf96275246dc2b3 100644 (file)
--- a/busybox/archival/libunarchive/Makefile.in
+++ b/busybox/archival/libunarchive/Makefile.in
@@ -77,7 +77,7 @@ LIBUNARCHIVE-$(CONFIG_UNZIP) += $(GUNZIP_FILES)
 libraries-y+=$(LIBUNARCHIVE_DIR)$(LIBUNARCHIVE_AR)
 
 $(LIBUNARCHIVE_DIR)$(LIBUNARCHIVE_AR): $(patsubst %,$(LIBUNARCHIVE_DIR)%, $(LIBUNARCHIVE-y))
-       $(AR) -ro $@ $(patsubst %,$(LIBUNARCHIVE_DIR)%, $(LIBUNARCHIVE-y))
+       $(AR) $(ARFLAGS) $@ $(patsubst %,$(LIBUNARCHIVE_DIR)%, $(LIBUNARCHIVE-y))
 
 $(LIBUNARCHIVA_DIR)%.o: $(srcdir)/%.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<

diff --git a/busybox/console-tools/Makefile.in b/busybox/console-tools/Makefile.in
index b19ce5cb251d174a0f35837ed488ef4fd03a6fdc..23ce3739777bc18a0a1b48ee252cce7d499c16aa 100644 (file)
--- a/busybox/console-tools/Makefile.in
+++ b/busybox/console-tools/Makefile.in
@@ -37,7 +37,7 @@ CONSOLETOOLS_DIR-$(CONFIG_SETKEYCODES)        += setkeycodes.o
 libraries-y+=$(CONSOLETOOLS_DIR)$(CONSOLETOOLS_AR)
 
 $(CONSOLETOOLS_DIR)$(CONSOLETOOLS_AR): $(patsubst %,$(CONSOLETOOLS_DIR)%, $(CONSOLETOOLS_DIR-y))
-       $(AR) -ro $@ $(patsubst %,$(CONSOLETOOLS_DIR)%, $(CONSOLETOOLS_DIR-y))
+       $(AR) $(ARFLAGS) $@ $(patsubst %,$(CONSOLETOOLS_DIR)%, $(CONSOLETOOLS_DIR-y))
 
 $(CONSOLETOOLS_DIR)%.o: $(srcdir)/%.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<

diff --git a/busybox/coreutils/Makefile.in b/busybox/coreutils/Makefile.in
index aacb813b3a6ae5e49a64b9415fff25a19ca4174f..628aae0dbd2245da0edd516353c97d46aeb2f206 100644 (file)
--- a/busybox/coreutils/Makefile.in
+++ b/busybox/coreutils/Makefile.in
@@ -91,7 +91,7 @@ COREUTILS-$(CONFIG_YES)       += yes.o
 libraries-y+=$(COREUTILS_DIR)$(COREUTILS_AR)
 
 $(COREUTILS_DIR)$(COREUTILS_AR): $(patsubst %,$(COREUTILS_DIR)%, $(COREUTILS-y))
-       $(AR) -ro $@ $(patsubst %,$(COREUTILS_DIR)%, $(COREUTILS-y))
+       $(AR) $(ARFLAGS) $@ $(patsubst %,$(COREUTILS_DIR)%, $(COREUTILS-y))
 
 $(COREUTILS_DIR)%.o: $(srcdir)/%.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<

diff --git a/busybox/coreutils/libcoreutils/Makefile.in b/busybox/coreutils/libcoreutils/Makefile.in
index cf83d7107b44562e01630ce114ec353f163071a0..5f692b600f189cf10312c81c2d33dab1acf4f03f 100644 (file)
--- a/busybox/coreutils/libcoreutils/Makefile.in
+++ b/busybox/coreutils/libcoreutils/Makefile.in
@@ -30,7 +30,7 @@ LIBCOREUTILS_OBJS=$(patsubst %.c,$(LIBCOREUTILS_DIR)%.o, $(LIBCOREUTILS_SRC))
 libraries-y+=$(LIBCOREUTILS_DIR)$(LIBCOREUTILS_AR)
 
 $(LIBCOREUTILS_DIR)$(LIBCOREUTILS_AR): $(LIBCOREUTILS_OBJS)
-       $(AR) -ro $@ $(LIBCOREUTILS_OBJS)
+       $(AR) $(ARFLAGS) $@ $(LIBCOREUTILS_OBJS)
 
 $(LIBCOREUTILS_DIR)%.o: $(srcdir)/%.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<

diff --git a/busybox/debianutils/Makefile.in b/busybox/debianutils/Makefile.in
index 3a204033e6a6931e5084a80dfecf1752d2b8e7c9..67f5dd53ff58ed71b5e8f22c290e5660eef6efaa 100644 (file)
--- a/busybox/debianutils/Makefile.in
+++ b/busybox/debianutils/Makefile.in
@@ -34,7 +34,7 @@ DEBIANUTILS-$(CONFIG_WHICH)           += which.o
 libraries-y+=$(DEBIANUTILS_DIR)$(DEBIANUTILS_AR)
 
 $(DEBIANUTILS_DIR)$(DEBIANUTILS_AR): $(patsubst %,$(DEBIANUTILS_DIR)%, $(DEBIANUTILS-y))
-       $(AR) -ro $@ $(patsubst %,$(DEBIANUTILS_DIR)%, $(DEBIANUTILS-y))
+       $(AR) $(ARFLAGS) $@ $(patsubst %,$(DEBIANUTILS_DIR)%, $(DEBIANUTILS-y))
 
 $(DEBIANUTILS_DIR)%.o: $(srcdir)/%.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<

diff --git a/busybox/docs/busybox.net/FAQ.html b/busybox/docs/busybox.net/FAQ.html
index a9324ae2687039e1d2769309a2c4da77dcc0f682..8de06e632361459969df4d7733edab334f5ef5c3 100644 (file)
--- a/busybox/docs/busybox.net/FAQ.html
+++ b/busybox/docs/busybox.net/FAQ.html
@@ -254,68 +254,33 @@ have additions to this FAQ document, we would love to add them,
     trust PayPal...
 
 <hr />
+<p>
+<h2><a name="optimize">I want to make busybox even smaller, how do I go about it?</a></h2>
+<p>
+       To conserve bytes it's good to know where they're being used, and the
+       size of the final executable isn't always a reliable indicator of
+       the size of the components (since various structures are rounded up,
+       so a small change may not even be visible by itself, but many small
+       savings add up).
+</p>
+<p>
+       To examine a busybox binary with an eye to saving bytes, build an
+       optimized debug version and run the "nm" command against it, like so:
+</p>
+<p>
+       make clean && make STRIPCMD=/bin/true && nm --size-sort busybox
+</p>
+<p>
+       This gives a list of symbols and the amount of space allocated for
+       each one, sorted by size.  (Note: do not enable CONFIG_DEBUG for this,
+       as that disables compiler optimization which is great for running gdb
+       but misleading when trying to figure out how much space each component
+       is really using under normal circumstances.)
+</p>
+<hr />
+
+
 
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
 <br>
 <br>
 <br>

diff --git a/busybox/editors/Makefile.in b/busybox/editors/Makefile.in
index 571e05568147ddcf545a8eecf597a77c78646a48..b43cc463bdfd1325424826f86d6d741e04578259 100644 (file)
--- a/busybox/editors/Makefile.in
+++ b/busybox/editors/Makefile.in
@@ -41,7 +41,7 @@ ifeq ($(needlibm-y),y)
 endif
 
 $(EDITOR_DIR)$(EDITOR_AR): $(patsubst %,$(EDITOR_DIR)%, $(EDITOR-y))
-       $(AR) -ro $@ $(patsubst %,$(EDITOR_DIR)%, $(EDITOR-y))
+       $(AR) $(ARFLAGS) $@ $(patsubst %,$(EDITOR_DIR)%, $(EDITOR-y))
 
 $(EDITOR_DIR)%.o: $(srcdir)/%.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<

diff --git a/busybox/findutils/Makefile.in b/busybox/findutils/Makefile.in
index ae71070d9200a6efc0bd156267d84fab12e778ee..107d2519e4df3c9922350fea609cd69bb9699b58 100644 (file)
--- a/busybox/findutils/Makefile.in
+++ b/busybox/findutils/Makefile.in
@@ -31,7 +31,7 @@ FINDUTILS-$(CONFIG_XARGS)     += xargs.o
 libraries-y+=$(FINDUTILS_DIR)$(FINDUTILS_AR)
 
 $(FINDUTILS_DIR)$(FINDUTILS_AR): $(patsubst %,$(FINDUTILS_DIR)%, $(FINDUTILS-y))
-       $(AR) -ro $@ $(patsubst %,$(FINDUTILS_DIR)%, $(FINDUTILS-y))
+       $(AR) $(ARFLAGS) $@ $(patsubst %,$(FINDUTILS_DIR)%, $(FINDUTILS-y))
 
 $(FINDUTILS_DIR)%.o: $(srcdir)/%.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<

diff --git a/busybox/init/Makefile.in b/busybox/init/Makefile.in
index 807259dee1a4883a10be7323e019390de0bb3f9a..9e3eadf51147ac38820a012a95ef2e4f2354e936 100644 (file)
--- a/busybox/init/Makefile.in
+++ b/busybox/init/Makefile.in
@@ -55,7 +55,7 @@ endif
 libraries-y+=$(INIT_DIR)$(INIT_AR)
 
 $(INIT_DIR)$(INIT_AR): $(patsubst %,$(INIT_DIR)%, $(INIT-y))
-       $(AR) -ro $@ $(patsubst %,$(INIT_DIR)%, $(INIT-y))
+       $(AR) $(ARFLAGS) $@ $(patsubst %,$(INIT_DIR)%, $(INIT-y))
 
 $(INIT_DIR)%.o: $(srcdir)/%.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<

diff --git a/busybox/libbb/Makefile.in b/busybox/libbb/Makefile.in
index d4c5ec14a11cb4bd281fe4169c5e00704e30c357..212ed70b7bae5ce3da79b5c488224311b21f88c6 100644 (file)
--- a/busybox/libbb/Makefile.in
+++ b/busybox/libbb/Makefile.in
@@ -84,7 +84,7 @@ libraries-y+=$(LIBBB_DIR)$(LIBBB_AR)
 
 $(LIBBB_DIR)$(LIBBB_AR): $(LIBBB_OBJS) $(LIBBB_MOBJS0) $(LIBBB_MOBJS1) \
        $(LIBBB_MOBJS2) $(LIBBB_MOBJS3) $(LIBBB_MOBJS4)
-       $(AR) -ro $@ $(LIBBB_OBJS) $(LIBBB_MOBJS0) $(LIBBB_MOBJS1) \
+       $(AR) $(ARFLAGS) $@ $(LIBBB_OBJS) $(LIBBB_MOBJS0) $(LIBBB_MOBJS1) \
                $(LIBBB_MOBJS2) $(LIBBB_MOBJS3) $(LIBBB_MOBJS4)
 
 $(LIBBB_DIR)%.o: $(srcdir)/%.c

diff --git a/busybox/libpwdgrp/Makefile.in b/busybox/libpwdgrp/Makefile.in
index 9bdfc10d811398743854ea2d58c1af0c4f95cb72..7d7241c6600a32723dac33a51e16ebef4a8160dc 100644 (file)
--- a/busybox/libpwdgrp/Makefile.in
+++ b/busybox/libpwdgrp/Makefile.in
@@ -42,7 +42,7 @@ LIBPWDGRP_MOBJS1=$(patsubst %,$(LIBPWDGRP_DIR)%, $(LIBPWDGRP_MOBJ1-y))
 libraries-y+=$(LIBPWDGRP_DIR)$(LIBPWDGRP_AR)
 
 $(LIBPWDGRP_DIR)$(LIBPWDGRP_AR): $(LIBPWDGRP_MOBJS0) $(LIBPWDGRP_MOBJS1)
-       $(AR) -ro $@ $(LIBPWDGRP_MOBJS0) $(LIBPWDGRP_MOBJS1)
+       $(AR) $(ARFLAGS) $@ $(LIBPWDGRP_MOBJS0) $(LIBPWDGRP_MOBJS1)
 
 $(LIBPWDGRP_MOBJS0): $(LIBPWDGRP_MSRC0)
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DL_$(notdir $*) -c $< -o $@

diff --git a/busybox/loginutils/Makefile.in b/busybox/loginutils/Makefile.in
index 96a61e60ffa09112751b98b622547926d0059d64..cb8733f42c6faabadc4408722e2092adcd83c206 100644 (file)
--- a/busybox/loginutils/Makefile.in
+++ b/busybox/loginutils/Makefile.in
@@ -50,7 +50,7 @@ ifeq ($(needcrypt-y),y)
 endif
 
 $(LOGINUTILS_DIR)$(LOGINUTILS_AR): $(patsubst %,$(LOGINUTILS_DIR)%, $(LOGINUTILS-y))
-       $(AR) -ro $@ $(patsubst %,$(LOGINUTILS_DIR)%, $(LOGINUTILS-y))
+       $(AR) $(ARFLAGS) $@ $(patsubst %,$(LOGINUTILS_DIR)%, $(LOGINUTILS-y))
 
 $(LOGINUTILS_DIR)%.o: $(srcdir)/%.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<

diff --git a/busybox/miscutils/Makefile.in b/busybox/miscutils/Makefile.in
index ddddf72b305f99b8a67b8f2743ec7896e3f2d27d..6c5ab0d0405f59d8ae0d86249db87d929c3f3fa4 100644 (file)
--- a/busybox/miscutils/Makefile.in
+++ b/busybox/miscutils/Makefile.in
@@ -48,7 +48,7 @@ ifeq ($(needlibm-y),y)
 endif
 
 $(MISCUTILS_DIR)$(MISCUTILS_AR): $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y))
-       $(AR) -ro $@ $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y))
+       $(AR) $(ARFLAGS) $@ $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y))
 
 $(MISCUTILS_DIR)%.o: $(srcdir)/%.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<

diff --git a/busybox/modutils/Makefile.in b/busybox/modutils/Makefile.in
index 9bd11d4d84bab4d3ba645262b791f6354fe7c416..7bfbae3a42df38767b86774f0752cfdc33eb672a 100644 (file)
--- a/busybox/modutils/Makefile.in
+++ b/busybox/modutils/Makefile.in
@@ -32,7 +32,7 @@ MODUTILS-$(CONFIG_RMMOD)              += rmmod.o
 libraries-y+=$(MODUTILS_DIR)$(MODUTILS_AR)
 
 $(MODUTILS_DIR)$(MODUTILS_AR): $(patsubst %,$(MODUTILS_DIR)%, $(MODUTILS-y))
-       $(AR) -ro $@ $(patsubst %,$(MODUTILS_DIR)%, $(MODUTILS-y))
+       $(AR) $(ARFLAGS) $@ $(patsubst %,$(MODUTILS_DIR)%, $(MODUTILS-y))
 
 $(MODUTILS_DIR)%.o: $(srcdir)/%.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<

diff --git a/busybox/networking/Makefile.in b/busybox/networking/Makefile.in
index 9bfe9017671269347671fb30145e3a564a89c66f..f0157ad597426eb83828cbe1b6ebf6da759e76eb 100644 (file)
--- a/busybox/networking/Makefile.in
+++ b/busybox/networking/Makefile.in
@@ -61,7 +61,7 @@ ifeq ($(needcrypt-y),y)
 endif
 
 $(NETWORKING_DIR)$(NETWORKING_AR): $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y))
-       $(AR) -ro $@ $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y))
+       $(AR) $(ARFLAGS) $@ $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y))
 
 $(NETWORKING_DIR)%.o: $(srcdir)/%.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<

diff --git a/busybox/networking/libiproute/Makefile.in b/busybox/networking/libiproute/Makefile.in
index fcc7f48cedf78a01e4711eadf935200115cd866f..a28af4611c88b48a7f56dc23070f9550e526853f 100644 (file)
--- a/busybox/networking/libiproute/Makefile.in
+++ b/busybox/networking/libiproute/Makefile.in
@@ -77,7 +77,7 @@ LIBIPROUTE-$(CONFIG_IPTUNNEL) += \
 libraries-y+=$(LIBIPROUTE_DIR)$(LIBIPROUTE_AR)
 
 $(LIBIPROUTE_DIR)$(LIBIPROUTE_AR): $(patsubst %,$(LIBIPROUTE_DIR)%, $(LIBIPROUTE-y))
-       $(AR) -ro $@ $(patsubst %,$(LIBIPROUTE_DIR)%, $(LIBIPROUTE-y))
+       $(AR) $(ARFLAGS) $@ $(patsubst %,$(LIBIPROUTE_DIR)%, $(LIBIPROUTE-y))
 
 $(LIBIPROUTE_DIR)%.o: $(srcdir)/%.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<

diff --git a/busybox/networking/udhcp/Makefile.in b/busybox/networking/udhcp/Makefile.in
index 94750f69374b1ff67ae270eda283a298819182e9..ac9be5c570da038a97dcc3b44d1c33a75bf92444 100644 (file)
--- a/busybox/networking/udhcp/Makefile.in
+++ b/busybox/networking/udhcp/Makefile.in
@@ -47,7 +47,7 @@ UDHCP_OBJS=$(patsubst %.c,$(UDHCP_DIR)%.o, $(UDHCP-y))
 libraries-y+=$(UDHCP_DIR)$(UDHCP_AR)
 
 $(UDHCP_DIR)$(UDHCP_AR): $(UDHCP_OBJS)
-       $(AR) -ro $@ $(UDHCP_OBJS)
+       $(AR) $(ARFLAGS) $@ $(UDHCP_OBJS)
 
 $(UDHCP_OBJS): $(UDHCP_DIR)%.o : $(srcdir)/%.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DIN_BUSYBOX -c $< -o $@

diff --git a/busybox/networking/udhcp/clientpacket.c b/busybox/networking/udhcp/clientpacket.c
index ec96601cb6c5a32e85ca1d9cd97c44d9e4189733..a0e8ccfb61d5a262823af6760e54ef1a7e85f57d 100644 (file)
--- a/busybox/networking/udhcp/clientpacket.c
+++ b/busybox/networking/udhcp/clientpacket.c
@@ -76,7 +76,8 @@ static void init_packet(struct dhcpMessage *packet, char type)
 
        init_header(packet, type);
        memcpy(packet->chaddr, client_config.arp, 6);
-       add_option_string(packet->options, client_config.clientid);
+       if (client_config.clientid)
+           add_option_string(packet->options, client_config.clientid);
        if (client_config.hostname) add_option_string(packet->options, client_config.hostname);
        add_option_string(packet->options, (uint8_t *) &vendor_id);
 }

diff --git a/busybox/procps/Makefile.in b/busybox/procps/Makefile.in
index ced29a198efeef83850a05eafc92bdd6a818a78b..b9eb117fd8968a71af159262116cf230e3cd1e76 100644 (file)
--- a/busybox/procps/Makefile.in
+++ b/busybox/procps/Makefile.in
@@ -36,7 +36,7 @@ PROCPS-$(CONFIG_UPTIME)               += uptime.o
 libraries-y+=$(PROCPS_DIR)$(PROCPS_AR)
 
 $(PROCPS_DIR)$(PROCPS_AR): $(patsubst %,$(PROCPS_DIR)%, $(PROCPS-y))
-       $(AR) -ro $@ $(patsubst %,$(PROCPS_DIR)%, $(PROCPS-y))
+       $(AR) $(ARFLAGS) $@ $(patsubst %,$(PROCPS_DIR)%, $(PROCPS-y))
 
 $(PROCPS_DIR)%.o: $(srcdir)/%.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<

diff --git a/busybox/shell/Makefile.in b/busybox/shell/Makefile.in
index 61b2846ac5e1055c9fa0112c0520a1ae191d8d96..9677fd62f3418a5413e8ed4c6dabd3ff233b5207 100644 (file)
--- a/busybox/shell/Makefile.in
+++ b/busybox/shell/Makefile.in
@@ -33,7 +33,7 @@ SHELLT-$(CONFIG_FEATURE_COMMAND_EDITING)      += cmdedit.o
 libraries-y+=$(SHELL_DIR)$(SHELL_AR)
 
 $(SHELL_DIR)$(SHELL_AR): $(patsubst %,$(SHELL_DIR)%, $(SHELLT-y))
-       $(AR) -ro $@ $(patsubst %,$(SHELL_DIR)%, $(SHELLT-y))
+       $(AR) $(ARFLAGS) $@ $(patsubst %,$(SHELL_DIR)%, $(SHELLT-y))
 
 $(SHELL_DIR)%.o: $(srcdir)/%.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<

diff --git a/busybox/sysklogd/Makefile.in b/busybox/sysklogd/Makefile.in
index 99a5f823cb4301048e3068c3c7a761d13597edfd..78efdc7cff73465b2fc9e1396be67fd75927d191 100644 (file)
--- a/busybox/sysklogd/Makefile.in
+++ b/busybox/sysklogd/Makefile.in
@@ -32,7 +32,7 @@ SYSKLOGD-$(CONFIG_SYSLOGD)            += syslogd.o
 libraries-y+=$(SYSKLOGD_DIR)$(SYSKLOGD_AR)
 
 $(SYSKLOGD_DIR)$(SYSKLOGD_AR): $(patsubst %,$(SYSKLOGD_DIR)%, $(SYSKLOGD-y))
-       $(AR) -ro $@ $(patsubst %,$(SYSKLOGD_DIR)%, $(SYSKLOGD-y))
+       $(AR) $(ARFLAGS) $@ $(patsubst %,$(SYSKLOGD_DIR)%, $(SYSKLOGD-y))
 
 $(SYSKLOGD_DIR)%.o: $(srcdir)/%.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<

diff --git a/busybox/util-linux/Makefile.in b/busybox/util-linux/Makefile.in
index 0172b3562d6760a83a56655c5824d519387f8792..3e31f8d46898ff62d0bb57b3852014779c2edb9a 100644 (file)
--- a/busybox/util-linux/Makefile.in
+++ b/busybox/util-linux/Makefile.in
@@ -48,7 +48,7 @@ UTILLINUX-$(CONFIG_UMOUNT)            +=umount.o
 libraries-y+=$(UTILLINUX_DIR)$(UTILLINUX_AR)
 
 $(UTILLINUX_DIR)$(UTILLINUX_AR): $(patsubst %,$(UTILLINUX_DIR)%, $(UTILLINUX-y))
-       $(AR) -ro $@ $(patsubst %,$(UTILLINUX_DIR)%, $(UTILLINUX-y))
+       $(AR) $(ARFLAGS) $@ $(patsubst %,$(UTILLINUX_DIR)%, $(UTILLINUX-y))
 
 $(UTILLINUX_DIR)%.o: $(srcdir)/%.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<