summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/yajl/Makefile2
-rw-r--r--scripts/scan-pkgs.sh26
2 files changed, 1 insertions, 27 deletions
diff --git a/package/yajl/Makefile b/package/yajl/Makefile
index 44f7d247b..79248e4d9 100644
--- a/package/yajl/Makefile
+++ b/package/yajl/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= c953a53344c0e20a892fc042bbe69744
PKG_DESCR:= a small event-driven JSON parser written in ANSI C
PKG_SECTION:= libs
-PKG_BUILDDEP:= cmake-host
+PKG_BUILDDEP:= cmake-host ruby-host
PKG_URL:= http://lloyd.github.com/yajl/
PKG_SITES:= http://openadk.org/distfiles/
PKG_OPTS:= dev
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index c90760b6e..b6c932772 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -65,14 +65,6 @@ if [[ -n $ADK_PACKAGE_LIBX11 ]]; then
NEED_X11="$NEED_X11 libx11"
fi
-if [[ -n $ADK_COMPILE_ORBIT2 ]]; then
- NEED_LIBIDL="$NEED_LIBIDL orbit2"
-fi
-
-if [[ -n $ADK_PACKAGE_MESALIB ]]; then
- NEED_MAKEDEPEND="$NEED_MAKEDEPEND mesalib"
-fi
-
if [[ -n $ADK_COMPILE_OPENJDK ]]; then
NEED_GXX="$NEED_GXX openjdk"
NEED_XSLTPROC="$NEED_XSLTPROC openjdk"
@@ -121,10 +113,6 @@ if [[ -n $ADK_PACKAGE_EGLIBC ]]; then
NEED_GPERF="$NEED_GPERF eglibc"
fi
-if [[ -n $ADK_PACKAGE_YAJL ]]; then
- NEED_RUBY="$NEED_RUBY yajl"
-fi
-
if [[ -n $ADK_PACKAGE_XBMC ]]; then
NEED_SDLDEV="$NEED_SDLDEV xbmc"
NEED_SDLIMAGEDEV="$NEED_SDLIMAGEDEV xbmc"
@@ -301,13 +289,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
@@ -336,13 +317,6 @@ if [[ -n $NEED_DBUSGLIB ]]; then
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 $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.