From: PHO <pho@cielonegro.org>
Date: Thu, 23 Feb 2012 09:57:31 +0000 (+0900)
Subject: Fix conflicts
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=build-hc-pkg.git;a=commitdiff_plain;h=104962c00b3b18e657e4bdeb7a37145d338cffbf;hp=e2b3313ef0dceb8c31abb2b058fd69eff0641f48

Fix conflicts
---

diff --git a/build-hc-pkg b/build-hc-pkg
index 1c1fe32..51b56f1 100755
--- a/build-hc-pkg
+++ b/build-hc-pkg
@@ -24,6 +24,17 @@ function detect_number_of_cpus () {
     esac
 }
 
+function detect_gnu_tar () {
+    if which gnutar >/dev/null 2>&1; then
+        echo "gnutar"
+    elif which gtar >/dev/null 2>&1; then
+        echo "gtar"
+    else
+        echo "We need GNU tar to be installed." >&2
+        exit 1
+    fi
+}
+
 function say_hello () {
     local -r platform=$(detect_platform_type)
     local -r n_cpus=$(detect_number_of_cpus)
@@ -61,6 +72,7 @@ function build_hc_pkg () {
         -f mk/main.mk \
         SRCPATH="$srcpath" \
         PLATFORM="$(detect_platform_type)" \
+        GNUTAR="$(detect_gnu_tar)" \
         SHELL="$SHELL"
 
     echo "If you are done, run \"$0 clean\" to cleanup the working directory."
diff --git a/mk/main.mk b/mk/main.mk
index 815f653..cefcb83 100644
--- a/mk/main.mk
+++ b/mk/main.mk
@@ -1,5 +1,5 @@
 DIRNAME    := $(patsubst %-src.tar.bz2,%,$(notdir $(SRCPATH)))
-GNUTAR     ?= gnutar
+GNUTAR     ?= gtar
 HC_TARNAME ?= $(DIRNAME)-boot-$(PLATFORM).tar.bz2
 
 all: work/pack-hc-pkg.stamp