X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fhost-build.mk;h=0502d7682a5c9514cd4e10d84fbdccfbef7375f8;hb=ea7aaaa2a0ea06ec851c60d610245f24ac97856a;hp=5670b6f17db78992e10a8a5e95fedeeafb9c29ed;hpb=b8885f1f93a2d6cf32afdf2e59f87a837a0d4de7;p=openwrt-10.03%2F.git diff --git a/include/host-build.mk b/include/host-build.mk index 5670b6f17..0502d7682 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -5,33 +5,12 @@ # See /LICENSE for more information. # -include $(TOPDIR)/.host.mk - -$(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host-build.mk - echo "HOST_OS:=`uname`" > $@ - echo "HOST_ARCH:=` \ - $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \ - -e 's/sparc.*/sparc/' \ - -e 's/arm.*/arm/' \ - -e 's/m68k.*/m68k/' \ - -e 's/ppc/powerpc/' \ - -e 's/v850.*/v850/' \ - -e 's/sh[234]/sh/' \ - -e 's/mips-.*/mips/' \ - -e 's/mipsel-.*/mipsel/' \ - -e 's/cris.*/cris/' \ - -e 's/i[3-9]86/i386/'`" >> $@ - echo "GNU_HOST_NAME:=`$(HOSTCC) -dumpmachine`" >> $@ - - -ifneq ($(strip $(PKG_CAT)),) - ifeq ($(PKG_CAT),unzip) - UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) - else - UNPACK=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - - endif +include $(INCLUDE_DIR)/host.mk +include $(INCLUDE_DIR)/unpack.mk + +ifneq ($(strip $(PKG_UNPACK)),) define Build/Prepare/Default - $(UNPACK) + $(PKG_UNPACK) @if [ -d ./patches ]; then \ $(PATCH) $(PKG_BUILD_DIR) ./patches; \ fi