X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=build-hc-pkg;h=87e34ef9ef0b63e70f6ca1993ff8d25a14b0810a;hb=a3d4e6a453a70d4321fb469538a108c98f850ab1;hp=1c1fe3201313da574233558fd53bb76088b5dba7;hpb=e2b3313ef0dceb8c31abb2b058fd69eff0641f48;p=build-hc-pkg.git diff --git a/build-hc-pkg b/build-hc-pkg index 1c1fe32..87e34ef 100755 --- a/build-hc-pkg +++ b/build-hc-pkg @@ -12,7 +12,9 @@ function detect_platform_type () { } function detect_number_of_cpus () { - case "$(detect_platform_type)" in + local -r platform=$(detect_platform_type) + + case "$platform" in *-*-darwin) ioreg -r -c IOCPU | fgrep -c IOCPUNumber ;; @@ -24,9 +26,21 @@ 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) + echo "This is build-hc-pkg, running on $platform with $n_cpus processors." } @@ -61,6 +75,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."