From 56eebd08c050eaea2c2844c1fd01f03946d457e3 Mon Sep 17 00:00:00 2001 From: Wade Berrier Date: Mon, 6 Oct 2008 19:20:58 +0000 Subject: [PATCH] Makefile.autotools.in: -Make tar switches 1.14 compatible (Not sure of a more elegant way to handle this ... ?) --- package/Makefile.autotools.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in index 9c16972827..8294ebfa63 100644 --- a/package/Makefile.autotools.in +++ b/package/Makefile.autotools.in @@ -124,6 +124,8 @@ TAR ?= tar #AUTORECONF ?= autoreconf -v -i -f -I $(ACLOCAL_STAGING_DIR) # ACLOCAL="$(ACLOCAL)" +# Automatically detect tar --strip-path/components option +TAR_STRIP_COMPONENTS = $(shell tar --help | grep strip-path > /dev/null ; if test $$? = 0 ; then echo '--strip-path' ; else echo '--strip-components' ; fi) ################################################################################ # Implicit targets -- produce a stamp file for each step of a package build @@ -152,7 +154,7 @@ $(BUILD_DIR)/%/.stamp_extracted: $(call MESSAGE,"Extracting") $(Q)mkdir -p $(@D) $(Q)$(INFLATE$(suffix $($(PKG)_SOURCE))) $(DL_DIR)/$($(PKG)_SOURCE) | \ - $(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) - + $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - # some packages have messed up permissions inside $(Q)chmod -R ug+rw $(@D) $(Q)touch $@