From 800e84cc0ff36cfbc254ec9681d8731a4fd480f1 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 22 Feb 2009 04:37:20 +0000 Subject: build system refactoring in preparation for allowing packages to do host-build steps git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14610 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/unpack.mk | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) (limited to 'include/unpack.mk') diff --git a/include/unpack.mk b/include/unpack.mk index 9b68e5dea..ddd5fd11f 100644 --- a/include/unpack.mk +++ b/include/unpack.mk @@ -11,13 +11,13 @@ ifneq ($(HOST_OS),Linux) else HOST_TAR:=$(TAR) endif -TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -UNZIP_CMD:=unzip -d $(PKG_BUILD_DIR)/.. $(DL_DIR)/$(PKG_SOURCE) +TAR_CMD=$(HOST_TAR) -C $(1)/.. $(TAR_OPTIONS) +UNZIP_CMD=unzip -d $(1)/.. $(DL_DIR)/$(PKG_SOURCE) ifeq ($(PKG_SOURCE),) PKG_UNPACK ?= true endif -ifeq ($(strip $(PKG_UNPACK)),) +ifeq ($(strip $(PKG_UNPACK))$(strip $(HOST_UNPACK)),) ifeq ($(strip $(PKG_CAT)),) # try to autodetect file type EXT:=$(call ext,$(PKG_SOURCE)) @@ -25,40 +25,44 @@ ifeq ($(strip $(PKG_UNPACK)),) ifeq ($(filter gz tgz,$(EXT)),$(EXT)) EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=)) - UNPACK:=gzip -dc $(DL_DIR)/$(PKG_SOURCE) | - endif + DECOMPRESS_CMD:=gzip -dc $(DL_DIR)/$(PKG_SOURCE) | + endif ifeq ($(filter bzip2 bz2 bz tbz2 tbz,$(EXT)),$(EXT)) EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=)) - UNPACK:=bzcat $(DL_DIR)/$(PKG_SOURCE) | + DECOMPRESS_CMD:=bzcat $(DL_DIR)/$(PKG_SOURCE) | endif ifeq ($(filter tgz tbz tbz2,$(EXT1)),$(EXT1)) EXT:=tar endif - UNPACK ?= cat $(DL_DIR)/$(PKG_SOURCE) | + DECOMPRESS_CMD ?= cat $(DL_DIR)/$(PKG_SOURCE) | ifeq ($(EXT),tar) - PKG_UNPACK:=$(UNPACK) $(TAR_CMD) + UNPACK_CMD=$(DECOMPRESS_CMD) $(TAR_CMD) endif ifeq ($(EXT),cpio) - PKG_UNPACK:=$(UNPACK) (cd $(PKG_BUILD_DIR)/..; cpio -i -d) + UNPACK_CMD=$(DECOMPRESS_CMD) (cd $(1)/..; cpio -i -d) endif ifeq ($(EXT),zip) - PKG_UNPACK:=$(UNZIP_CMD) + UNPACK_CMD=$(UNZIP_CMD) endif endif - + # compatibility code for packages that set PKG_CAT - ifeq ($(strip $(PKG_UNPACK)),) + ifeq ($(strip $(UNPACK_CMD)),) # use existing PKG_CAT - PKG_UNPACK:=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD) + UNPACK_CMD=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD) ifeq ($(PKG_CAT),unzip) - PKG_UNPACK:=$(UNZIP_CMD) + UNPACK_CMD=$(UNZIP_CMD) endif # replace zcat with $(ZCAT), because some system don't support it properly ifeq ($(PKG_CAT),zcat) - PKG_UNPACK:=gzip -dc $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD) + UNPACK_CMD=gzip -dc $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD) endif endif ifneq ($(strip $(CRLF_WORKAROUND)),) - PKG_UNPACK += && find $(PKG_BUILD_DIR) -type f -print0 | xargs -0 perl -pi -e 's!\r$$$$!!g' + CRLF_CMD := && find $(PKG_BUILD_DIR) -type f -print0 | xargs -0 perl -pi -e 's!\r$$$$!!g' + else + CRLF_CMD := endif + PKG_UNPACK := $(call UNPACK_CMD,$(PKG_BUILD_DIR)) $(call CRLF_CMD,$(PKG_BUILD_DIR)) + HOST_UNPACK := $(call UNPACK_CMD,$(HOST_BUILD_DIR)) $(call CRLF_CMD,$(HOST_BUILD_DIR)) endif -- cgit v1.2.3