Changeset 7096


Ignore:
Timestamp:
2007-05-05T12:35:12+02:00 (9 years ago)
Author:
nbd
Message:

simplify handling of zcat - always use gzip -dc. zcat and gzcat are either broken or nonexistant on some systems

Location:
trunk/include
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/host.mk

    r7065 r7096  
    2929                [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \ 
    3030                echo "TAR:=$$TAR" >> $@; \ 
    31                 ZCAT=`which gzcat 2>/dev/null`; \ 
    32                 [ -n "$$ZCAT" -a -x "$$ZCAT" ] || ZCAT=`which zcat 2>/dev/null`; \ 
    33                 echo "ZCAT:=$$ZCAT" >> $@; \ 
    3431                echo "BASH:=$(shell which bash)" >> $@; \ 
    3532        ) 
  • trunk/include/unpack.mk

    r6587 r7096  
    2121    ifeq ($(filter gz tgz,$(EXT)),$(EXT)) 
    2222      EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=)) 
    23       UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | 
     23      UNPACK:=gzip -dc $(DL_DIR)/$(PKG_SOURCE) | 
    2424    endif        
    2525    ifeq ($(filter bzip2 bz2 bz tbz2 tbz,$(EXT)),$(EXT)) 
     
    4949      PKG_UNPACK:=$(UNZIP_CMD) 
    5050    endif 
    51     # replace zcat with $(ZCAT), because some system have it as gzcat 
     51    # replace zcat with $(ZCAT), because some system don't support it properly 
    5252    ifeq ($(PKG_CAT),zcat) 
    53       PKG_UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD) 
     53      PKG_UNPACK:=gzip -dc $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD) 
    5454    endif 
    5555  endif 
Note: See TracChangeset for help on using the changeset viewer.