From d258945b9b0f2b978c0ee2fa4c772827122065f0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 Jul 2010 22:24:15 +0200 Subject: fix tsort wrapper for NetBSD --- scripts/tsort | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/tsort b/scripts/tsort index 77ffa1237..93df1aa8a 100755 --- a/scripts/tsort +++ b/scripts/tsort @@ -4,10 +4,10 @@ os=$(uname) case $os in - NetBSD|MirBSD|OpenBSD) + MirBSD|OpenBSD) /usr/bin/tsort -r ;; - FreeBSD) + NetBSD|FreeBSD) /usr/bin/tsort | tail -r ;; *) -- cgit v1.2.3 From 88bbfd520998eab45c20b6d0b52793b2b6ad3907 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 30 Jul 2010 10:45:58 +0200 Subject: python is required for firefox, disable build of firefox on BSD for now --- package/firefox/Makefile | 1 + package/firefox/patches/patch-configure | 15 ++++++++++++--- scripts/adkprepare.sh | 3 +++ scripts/scan-pkgs.sh | 12 ++++++++++++ 4 files changed, 28 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 234386e9c..970037f08 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -21,6 +21,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 WRKDIST= ${WRKDIR}/mozilla-1.9.2 PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle ibmx40 lemote +PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin include $(TOPDIR)/mk/package.mk diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure index f424b3787..28035c66a 100644 --- a/package/firefox/patches/patch-configure +++ b/package/firefox/patches/patch-configure @@ -1,6 +1,15 @@ ---- mozilla-1.9.2.orig/configure 2010-04-02 18:07:41.000000000 +0200 -+++ mozilla-1.9.2/configure 2010-04-11 14:38:39.000000000 +0200 -@@ -21012,8 +21012,8 @@ if test -n "$CROSS_COMPILE"; then +--- mozilla-1.9.2.orig/configure 2010-07-23 00:00:19.000000000 +0200 ++++ mozilla-1.9.2/configure 2010-07-30 09:52:43.000000000 +0200 +@@ -3970,7 +3970,7 @@ else + echo "$ac_t""yes" 1>&6 + fi + +- for ac_prog in $PYTHON python2.5 python2.4 python ++ for ac_prog in $PYTHON python2.6 python2.5 python2.4 python + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -21285,8 +21285,8 @@ if test -n "$CROSS_COMPILE"; then HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" fi if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh index 5faaed56e..ac5169986 100755 --- a/scripts/adkprepare.sh +++ b/scripts/adkprepare.sh @@ -55,6 +55,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 @@ -62,6 +64,7 @@ netbsd_full() { pkg_add -vu bison pkg_add -vu libIDL pkg_add -vu xkbcomp + pkg_add -vu python26 } freebsd() { diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index f08ee812a..9470c0d3f 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -36,6 +36,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 @@ -241,4 +242,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 -- cgit v1.2.3 From f6fc0696b89cf3c15479a1fe69de2c6acfe72d9f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 30 Jul 2010 11:09:08 +0200 Subject: add openbsd function --- scripts/adkprepare.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh index 5faaed56e..acf6bfbfd 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() { @@ -66,7 +79,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() { -- cgit v1.2.3 From 4d36338cd8f5a2ede3f6d199a9e507fe10b95959 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 30 Jul 2010 11:09:34 +0200 Subject: automake needs autoconf, autoconf needs m4 --- scripts/scan-pkgs.sh | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) (limited to 'scripts') diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index f08ee812a..ef278da92 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" @@ -55,8 +54,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 @@ -139,6 +145,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 @@ -220,13 +240,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 -- cgit v1.2.3