diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/cpio | 14 | ||||
| -rw-r--r-- | scripts/rstrip.sh | 1 | ||||
| -rw-r--r-- | scripts/scan-tools.sh | 20 | ||||
| -rwxr-xr-x | scripts/tarpkg | 2 |
4 files changed, 21 insertions, 16 deletions
diff --git a/scripts/cpio b/scripts/cpio index fc671ca48..1c481221e 100755 --- a/scripts/cpio +++ b/scripts/cpio @@ -2,8 +2,18 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. +os=$(uname) +case $os in + NetBSD|MirBSD) + quiet="" + ;; + *) + quiet="--quiet" + ;; +esac if [ -x /usr/bin/cpio ];then - /usr/bin/cpio --quiet "$@" + /usr/bin/cpio $quiet "$@" else - /bin/cpio --quiet "$@" + /bin/cpio $quiet "$@" fi + diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh index d897c0ef3..591c5bb07 100644 --- a/scripts/rstrip.sh +++ b/scripts/rstrip.sh @@ -58,3 +58,4 @@ find $TARGETS -type f -a -exec file {} \; | \ echo "-> $T $F" eval "$T $F" done +exit 0 diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 743f316b0..56b79663d 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -47,12 +47,7 @@ CYG*) echo 'See http://www.cygwin.com/1.7/cygwin-ug-net/using-specialnames.html' ;; NetBSD) - echo "Building OpenADK on $os is currently unsupported." - echo "Sorry." - echo - echo There are unresolved issues relating to ncurses not - echo being included in NetBSD®, and these provided by pkgsrc® - echo lack important header files. + # supported with no extra quirks at the moment ;; OpenBSD) # supported with no extra quirks at the moment @@ -191,13 +186,12 @@ if [[ $X != *@(Native compiler works)* ]]; then out=1 fi -[[ -s /usr/include/ncurses.h ]] || if [[ -s /usr/pkg/include/ncurses.h ]]; then - echo 'HOSTCFLAGS+= -isystem /usr/pkg/include' >>$topdir/prereq.mk - echo 'HOSTLDFLAGS+=-L/usr/pkg/lib -Wl,-rpath -Wl,/usr/pkg/lib' >>$topdir/prereq.mk -else - echo Install ncurses header files, please. - echo - out=1 +if [[ ! -s /usr/include/ncurses.h ]]; then + if [[ ! -s /usr/include/curses.h ]]; then + echo Install ncurses header files, please. + echo + out=1 + fi fi if ! which gawk >/dev/null 2>&1; then diff --git a/scripts/tarpkg b/scripts/tarpkg index 37c0b2079..6eca63a6f 100755 --- a/scripts/tarpkg +++ b/scripts/tarpkg @@ -1,6 +1,6 @@ #!/usr/bin/env bash # create/install compressed tar balls -#set -x +set -x if [ "$1" = "build" ];then if [ ! -d $2 ];then |