Browse Source

fix tar build, when gnu tar is missing

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Waldemar Brodkorb 10 years ago
parent
commit
062c92e812
2 changed files with 3 additions and 20 deletions
  1. 3 7
      scripts/scan-tools.sh
  2. 0 13
      scripts/tar

+ 3 - 7
scripts/scan-tools.sh

@@ -113,12 +113,6 @@ if [[ $X != *@(Native compiler works)* ]]; then
 fi
 rm test 2>/dev/null
 
-if ! which tar >/dev/null 2>&1; then
-	echo You must install tar to continue.
-	echo
-	out=1
-fi
-
 if ! which gzip >/dev/null 2>&1; then
 	echo You must install gzip to continue.
 	echo
@@ -235,10 +229,12 @@ if ! which pkgconf >/dev/null 2>&1; then
 fi
 
 host_build_tar=0
-if ! which tar >/dev/null 2>&1; then
+if which tar >/dev/null 2>&1; then
 	if ! tar --version 2>/dev/null|grep GNU >/dev/null;then
 		host_build_tar=1
 	fi
+else
+	host_build_tar=1
 fi
 
 host_build_findutils=0

+ 0 - 13
scripts/tar

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-if [ -z "$(which gtar 2>/dev/null)" ];then
-	if [ -x /bin/tar ];then
-		/bin/tar "$@"
-	else
-		/usr/bin/tar "$@"
-	fi
-else
-	gtar "$@"
-fi