another bsd bugfix

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5657 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Felix Fietkau 2006-11-27 05:23:22 +00:00
parent e18ccccffd
commit 0e48a91053
2 changed files with 6 additions and 4 deletions

View File

@ -1,16 +1,18 @@
ifeq ($(strip $(PKG_UNPACK)),)
ifneq ($(HOST_OS),Linux)
TAR := trapret 2 $(PKG_UNPACK) $(TAR)
HOST_TAR:=trapret 2 $(TAR)
else
HOST_TAR:=$(TAR)
endif
ifneq ($(strip $(PKG_CAT)),)
# use existing PKG_CAT
PKG_UNPACK:=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS)
PKG_UNPACK:=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS)
ifeq ($(PKG_CAT),unzip)
PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE)
endif
# replace zcat with $(ZCAT), because some system have it as gzcat
ifeq ($(PKG_CAT),zcat)
PKG_UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS)
PKG_UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS)
endif
else
# try to autodetect file type

View File

@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/host-build.mk
define Build/Prepare
mkdir -p $(TOOLCHAIN_BUILD_DIR)
bzcat $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS)
bzcat $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS)
$(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/generic-$(KERNEL)/patches
$(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)