diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/adkprepare.sh | 15 | ||||
| -rw-r--r-- | scripts/scan-pkgs.sh | 31 |
2 files changed, 36 insertions, 10 deletions
diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh index ac5169986..168938952 100755 --- a/scripts/adkprepare.sh +++ b/scripts/adkprepare.sh @@ -37,6 +37,18 @@ openbsd() { pkg_add -v xz } +openbsd_full() { + PKG_PATH="ftp://ftp.openbsd.org/pub/OpenBSD/${ver}/packages/${arch}/" + export PKG_PATH + pkg_add -v bison + pkg_add -v zip + pkg_add -v intltool + pkg_add -v libIDL + pkg_add -v m4 + pkg_add -v autoconf-2.62p0 + pkg_add -v gperf +} + netbsd() { echo "Preparing NetBSD for OpenADK" PKG_PATH="ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/${arch}/5.0/All/" @@ -51,6 +63,7 @@ netbsd() { pkg_add -vu gtar pkg_add -vu gsed pkg_add -vu gawk + pkg_add -vu gperf } netbsd_full() { @@ -69,7 +82,7 @@ netbsd_full() { freebsd() { echo "Preparing FreeBSD for OpenADK" - pkg_add -r git gmake mksh bash wget unzip gtar gsed gawk + pkg_add -r git gmake mksh bash wget unzip gtar gsed gawk gperf } freebsd_full() { diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 9470c0d3f..303935a9b 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -26,7 +26,6 @@ out=0 if [[ -n $ADK_NATIVE ]];then if [[ -n $ADK_PACKAGE_GIT ]];then NEED_CURLDEV="$NEED_CURLDEV git" - NEED_SSLDEV="$NEED_SSLDEV git" fi if [[ -n $ADK_TARGET_PACKAGE_RPM ]]; then NEED_RPM="$NEED_RPM rpm" @@ -56,8 +55,15 @@ if [[ -n $ADK_COMPILE_AVAHI ]]; then NEED_PKGCONFIG="$NEED_PKGCONFIG avahi" fi +if [[ -n $ADK_COMPILE_AUTOCONF ]]; then + NEED_M4="$NEED_M4 autoconf" +fi + +if [[ -n $ADK_COMPILE_AUTOMAKE ]]; then + NEED_AUTOCONF="$NEED_AUTOCONF automake" +fi + if [[ -n $ADK_PACKAGE_SQUID ]]; then - NEED_SSLDEV="$NEED_SSLDEV squid" NEED_GXX="$NEED_GXX squid" fi @@ -140,6 +146,20 @@ if [[ -n $NEED_MKFONTDIR ]]; then fi fi +if [[ -n $NEED_M4 ]]; then + if ! which m4 >/dev/null 2>&1; then + echo >&2 You need GNU m4 to build $NEED_M4 + out=1 + fi +fi + +if [[ -n $NEED_AUTOCONF ]]; then + if ! which autoconf >/dev/null 2>&1; then + echo >&2 You need autoconf to build $NEED_AUTOCONF + out=1 + fi +fi + if [[ -n $NEED_INTL ]]; then if ! which intltool-update >/dev/null 2>&1; then echo >&2 You need intltool to build $NEED_INTL @@ -221,13 +241,6 @@ if [[ -n $NEED_GLIBZWO ]]; then fi fi -if [[ -n $ADK_USE_CCACHE ]]; then - if ! which ccache >/dev/null 2>&1; then - echo >&2 You have selected to build with ccache, but ccache could not be found. - out=1 - fi -fi - if [[ -n $NEED_RPM ]]; then if ! which rpmbuild >/dev/null 2>&1; then echo >&2 You need rpmbuild to to use $NEED_RPM package backend |