summaryrefslogtreecommitdiff
path: root/package/busybox
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-01-30 18:35:58 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-01-30 18:35:58 +0100
commit5df306b0c9d713021edd9d81ff8f37b5d7f01db5 (patch)
treedbbdf0bbf67ec043ef84e51a6e3977c42c996520 /package/busybox
parent6e03bb38c5d0309200152a1293d87f09c8545e13 (diff)
use target-libc combination for all builddirs
IMPORTANT: do a make distclean before compiling after this commit. The directories for all build and bin directories changed, so that toolchains for different target-libc combinations can coexist. This might be usefule in the future for continous compiling after git commit, without rebuilding the toolchain. Rework busybox rebuild, when config changes. Not optimal, but at least working after this change to the directory structure.
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/Makefile25
1 files changed, 16 insertions, 9 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index b2509c937..7779226a7 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -18,23 +18,28 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-do-configure:
+${TOPDIR}/.busyboxcfg: ${TOPDIR}/.config
grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
- ${WRKBUILD}/.config
- $(SED) 's@IDIR@${WRKINST}' ${WRKBUILD}/.config
+ ${TOPDIR}/.busyboxcfg
+
+${WRKBUILD}/.config: ${TOPDIR}/.busyboxcfg
+ cp $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
+ $(SED) 's;@IDIR@;${WRKINST};' ${WRKBUILD}/.config
+
+do-configure: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
ifeq ($(ADK_NATIVE),y)
yes '' | \
$(MAKE) V=1 \
IPKG_ARCH="$(ARCH)" \
- ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig
+ ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
else
yes '' | \
$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(ARCH)" \
- ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig
+ ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
endif
-do-build:
+do-build: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
ifeq ($(ADK_NATIVE),y)
$(MAKE) V=1 \
IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
@@ -43,13 +48,13 @@ else
IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
endif
-do-install: ${TOPDIR}/.config
+do-install: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
ifeq ($(ADK_NATIVE),y)
$(MAKE) V=1 \
- IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install
+ IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
else
$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
- IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install
+ IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
endif
ifeq ($(ADK_DEBUG),y)
${INSTALL_BIN} $(WRKBUILD)/busybox_unstripped \
@@ -57,4 +62,6 @@ ifeq ($(ADK_DEBUG),y)
endif
$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
+fake: $(TOPDIR)/.busyboxcfg do-configure do-install
+
include ${TOPDIR}/mk/pkg-bottom.mk