Merge branch 'master' of git+ssh://openadk.org/git/openadk

1 files changed, 0 insertions, 204 deletions

diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 757ae4256..5d4a80abc 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -23,13 +23,6 @@ out=0
 
 . $topdir/.config
 
-uname -a|grep '\(Debian\|Ubuntu\)' >/dev/null 2>&1
-if [ $? -eq 0 ];then
-	if [[ -n $ADK_COMPILE_PYTHON2 ]]; then
-		NEED_DPKG_ARCHITECTURE="$NEED_DPKG_ARCHITECTURE python2"
-	fi
-fi
-
 if [[ -n $ADK_NATIVE ]];then
 	if [[ -n $ADK_PACKAGE_NEON ]];then
 		NEED_LIBXML2_DEV="$NEED_LIBXML2_DEV neon"
@@ -68,47 +61,7 @@ if [[ -n $ADK_NATIVE ]];then
 	fi
 fi
 
-if [[ -n $ADK_PACKAGE_LIBX11 ]]; then
-	NEED_X11="$NEED_X11 libx11"
-fi
-
-if [[ -n $ADK_PACKAGE_LIBNL ]]; then
-	NEED_FLEX="$NEED_FLEX libnl"
-fi
-
-if [[ -n $ADK_PACKAGE_GPSD ]]; then
-	NEED_PYTHON="$NEED_PYTHON gpsd"
-fi
-
-if [[ -n $ADK_PACKAGE_LIBVPX ]]; then
-	NEED_YASM="$NEED_YASM libvpx"
-fi
-
-if [[ -n $ADK_COMPILE_ORBIT2 ]]; then
-	NEED_LIBIDL="$NEED_LIBIDL orbit2"
-fi
-
-if [[ -n $ADK_PACKAGE_FIREFOX ]]; then
-	NEED_YASM="$NEED_YASM firefox"
-	NEED_LIBIDL="$NEED_LIBIDL firefox"
-	NEED_PYTHON="$NEED_PYTHON firefox"
-	NEED_ZIP="$NEED_ZIP firefox"
-fi
-
-if [[ -n $ADK_PACKAGE_MESALIB ]]; then
-	NEED_MAKEDEPEND="$NEED_MAKEDEPEND mesalib"
-fi
-
-if [[ -n $ADK_COMPILE_HEIMDAL ]]; then
-	NEED_BISON="$NEED_BISON heimdal-server"
-fi
-
-if [[ -n $ADK_COMPILE_KRB5 ]]; then
-	NEED_BISON="$NEED_BISON krb5"
-fi
-
 if [[ -n $ADK_COMPILE_OPENJDK ]]; then
-	NEED_ZIP="$NEED_ZIP openjdk"
 	NEED_GXX="$NEED_GXX openjdk"
 	NEED_XSLTPROC="$NEED_XSLTPROC openjdk"
 fi
@@ -119,43 +72,18 @@ if [[ -n $ADK_COMPILE_OPENJDK ]]; then
 fi
 
 if [[ -n $ADK_COMPILE_OPENJDK7 ]]; then
-	NEED_ZIP="$NEED_ZIP openjdk7"
-fi
-
-if [[ -n $ADK_COMPILE_OPENJDK7 ]]; then
 	cd ${TOPDIR}/jtools; bash prereq.sh
 	[ $? -ne 0 ] && out=1
 fi
 
-if [[ -n $ADK_PACKAGE_LIBXCB ]]; then
-	NEED_XSLTPROC="$NEED_XSLTPROC libxcb"
-fi
-
-if [[ -n $ADK_COMPILE_PCMCIAUTILS ]]; then
-	NEED_BISON="$NEED_BISON pcmciautils"
-	NEED_FLEX="$NEED_FLEX pcmciautils"
-fi
-
 if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then
 	NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config"
 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_COMPILE_COROSYNC ]]; then
 	NEED_GROFF="$NEED_GROFF corosync"
 fi
 
-if [[ -n $ADK_COMPILE_LIBTOOL ]]; then
-	NEED_AUTOMAKE="$NEED_AUTOMAKE libtool"
-fi
-
 if [[ -n $ADK_PACKAGE_SQUID ]]; then
 	NEED_GXX="$NEED_GXX squid"
 fi
@@ -164,11 +92,6 @@ if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then
 	NEED_INTL="$NEED_INTL xkeyboard-config"
 fi
 
-if [[ -n $ADK_PACKAGE_LIBPCAP ]]; then
-	NEED_FLEX="$NEED_FLEX libpcap"
-	NEED_BISON="$NEED_BISON libpcap"
-fi
-
 if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then
 	NEED_WWW="$NEED_WWW libXfont"
 	NEED_XMLTO="$NEED_XMLTO libXfont"
@@ -182,19 +105,6 @@ if [[ -n $ADK_PACKAGE_EGLIBC ]]; then
 	NEED_GPERF="$NEED_GPERF eglibc"
 fi
 
-if [[ -n $ADK_PACKAGE_GLIB ]]; then
-	NEED_GETTEXT="$NEED_GETTEXT glib"
-fi
-
-if [[ -n $ADK_PACKAGE_BCM2835_VC ]]; then
-	NEED_CMAKE="$NEED_CMAKE bcm2835-vc"
-fi
-
-if [[ -n $ADK_PACKAGE_YAJL ]]; then
-	NEED_RUBY="$NEED_RUBY yajl"
-	NEED_CMAKE="$NEED_CMAKE yajl"
-fi
-
 if [[ -n $ADK_PACKAGE_XBMC ]]; then
 	NEED_SDLDEV="$NEED_SDLDEV xbmc"
 	NEED_SDLIMAGEDEV="$NEED_SDLIMAGEDEV xbmc"
@@ -216,16 +126,6 @@ if [[ -n $ADK_PACKAGE_FONT_ADOBE_75DPI ]]; then
 	NEED_MKFONTDIR="$NEED_MKFONTDIR font-adobe-75dpi"
 fi
 
-if [[ -n $NEED_GETTEXT ]]; then
-	if ! which gettext >/dev/null 2>&1; then
-		echo >&2 You need gettext to build $NEED_GETTEXT
-		out=1
-	elif ! which msgfmt >/dev/null 2>&1; then
-		echo >&2 You need msgfmt to build $NEED_GETTEXT
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_LIBTIRPCDEV ]];then
 	if ! test -f /usr/include/tirpc/netconfig.h >/dev/null; then
 		echo >&2 You need tirpc headers to build $NEED_LIBTIRPCDEV
@@ -305,15 +205,6 @@ if [[ -n $NEED_X11DEV ]];then
 	fi
 fi
 
-if [[ -n $NEED_X11 ]];then
-	if ! test -f /usr/include/X11/X.h >/dev/null; then
-	  if ! test -f /usr/local/include/X11/X.h >/dev/null; then
-		echo >&2 You need X11 headers to build $NEED_X11
-		out=1
-	  fi
-	fi
-fi
-
 if [[ -n $NEED_XEXTDEV ]];then
 	if ! test -f /usr/include/X11/extensions/XShm.h >/dev/null; then
 		echo >&2 You need X11 extensions headers to build $NEED_XEXTDEV
@@ -342,27 +233,6 @@ 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_AUTOMAKE ]]; then
-	if ! which automake >/dev/null 2>&1; then
-		echo >&2 You need automake to build $NEED_AUTOMAKE
-		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
@@ -381,34 +251,6 @@ if [[ -n $NEED_WWW ]]; then
 	fi
 fi
 
-if [[ -n $NEED_BISON ]]; then
-	if ! which bison >/dev/null 2>&1; then
-		echo >&2 You need bison to build $NEED_BISON
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_CMAKE ]]; then
-	if ! which cmake >/dev/null 2>&1; then
-		echo >&2 You need cmake to build $NEED_CMAKE
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_ZIP ]]; then
-	if ! which zip >/dev/null 2>&1; then
-		echo >&2 You need zip to build $NEED_ZIP
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_LIBIDL ]]; then
-	if ! which libIDL-config-2 >/dev/null 2>&1; then
-		echo >&2 You need libIDL-config-2 to build $NEED_LIBIDL
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_SWIG ]]; then
 	if ! which swig >/dev/null 2>&1; then
 		echo >&2 You need swig to build $NEED_SWIG
@@ -430,13 +272,6 @@ if [[ -n $NEED_GXX ]]; then
 	fi
 fi
 
-if [[ -n $NEED_RUBY ]]; then
-	if ! which ruby >/dev/null 2>&1; then
-		echo >&2 You need ruby to build $NEED_RUBY
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_XKBCOMP ]]; then
 	if ! which xkbcomp >/dev/null 2>&1; then
 		echo >&2 You need xkbcomp to build $NEED_XKBCOMP
@@ -451,22 +286,6 @@ if [[ -n $NEED_RPM ]]; then
 	fi
 fi
 
-if [[ -n $NEED_FLEX ]]; then
-	if ! which flex >/dev/null 2>&1; then
-		echo >&2 You need flex to build $NEED_FLEX
-		out=1
-	fi
-fi
-
-if [[ -n $ADK_LINUX_X86 ]]; then
-	if [[ -n $NEED_YASM ]]; then
-		if ! which yasm >/dev/null 2>&1; then
-			echo >&2 You need yasm to build $NEED_YASM
-			out=1
-		fi
-	fi
-fi
-
 if [[ -n $NEED_XSLTPROC ]]; then
 	if ! which xsltproc >/dev/null 2>&1; then
 		echo >&2 You need xsltproc to build $NEED_XSLTPROC
@@ -481,29 +300,6 @@ if [[ -n $NEED_DBUSGLIB ]]; 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 build $NEED_PYTHON
-			out=1
-		fi
-	fi
-fi
-
-if [[ -n $NEED_MAKEDEPEND ]]; then
-	if ! which makedepend >/dev/null 2>&1; then
-		echo >&2 You need makedepend to build $NEED_MAKEDEPEND
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_DPKG_ARCHITECTURE ]]; then
-	if ! which dpkg-architecture >/dev/null 2>&1; then
-		echo >&2 You need dpkg-architecture to build $NEED_DPKG_ARCHITECTURE
-		out=1
-	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.