diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-30 11:09:39 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-30 11:09:39 +0200 |
| commit | 6506a9625c772f787201532cc579c2652ad437c8 (patch) | |
| tree | 0c100d31f4052751f48d7dd843a23ec0d9d5ae1b /scripts | |
| parent | 4d36338cd8f5a2ede3f6d199a9e507fe10b95959 (diff) | |
| parent | 0e9c9f94821959eb281428a52e3a5630765ca6ac (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/adkprepare.sh | 3 | ||||
| -rw-r--r-- | scripts/automake.dep | 3 | ||||
| -rw-r--r-- | scripts/scan-pkgs.sh | 12 | ||||
| -rwxr-xr-x | scripts/tsort | 5 |
4 files changed, 22 insertions, 1 deletions
diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh index acf6bfbfd..168938952 100755 --- a/scripts/adkprepare.sh +++ b/scripts/adkprepare.sh @@ -68,6 +68,8 @@ netbsd() { netbsd_full() { echo "Preparing NetBSD for full OpenADK package builds" + PKG_PATH="ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/${arch}/5.0/All/" + export PKG_PATH pkg_add -vu intltool pkg_add -vu lynx pkg_add -vu pkg-config @@ -75,6 +77,7 @@ netbsd_full() { pkg_add -vu bison pkg_add -vu libIDL pkg_add -vu xkbcomp + pkg_add -vu python26 } freebsd() { diff --git a/scripts/automake.dep b/scripts/automake.dep index 13e4e87a9..2cfd5d3ce 100644 --- a/scripts/automake.dep +++ b/scripts/automake.dep @@ -9,6 +9,8 @@ configure missing aclocal.m4 configure.in aclocal.m4 configure.ac aclocal.m4 acinclude.m4 +config-h.in configure.in +config-h.in configure.ac config.h.in configure.in config.h.in configure.ac config.h.in aclocal.m4 @@ -31,3 +33,4 @@ configure.in configure.files acinclude.m4 admin/libtool.m4.in acinclude.m4 admin/acinclude.m4.in acinclude.m4 libltdl/ltdl.m4 +libtoolize.in configure diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index ef278da92..303935a9b 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -35,6 +35,7 @@ fi if [[ -n $ADK_PACKAGE_FIREFOX ]]; then NEED_ZIP="$NEED_ZIP firefox" NEED_LIBIDL="$NEED_LIBIDL firefox" + NEED_PYTHON="$NEED_PYTHON firefox" fi if [[ -n $ADK_COMPILE_HEIMDAL ]]; then @@ -254,4 +255,15 @@ if [[ -n $NEED_FLEX ]]; then fi fi +if [[ -n $NEED_PYTHON ]]; then + if ! which python >/dev/null 2>&1; then + if ! test -x /usr/pkg/bin/python2.6 >/dev/null; then + echo >&2 You need python to to use $NEED_PYTHON package + out=1 + fi + fi +fi + +exit $out + exit $out diff --git a/scripts/tsort b/scripts/tsort index d4b176f6f..93df1aa8a 100755 --- a/scripts/tsort +++ b/scripts/tsort @@ -4,9 +4,12 @@ os=$(uname) case $os in - NetBSD|MirBSD|OpenBSD) + MirBSD|OpenBSD) /usr/bin/tsort -r ;; + NetBSD|FreeBSD) + /usr/bin/tsort | tail -r + ;; *) /usr/bin/tsort | tac ;; |