ruby: Fix parallel build

[openwrt/svn-archive/archive.git] / lang / sablevm-sdk / Makefile

diff --git a/lang/sablevm-sdk/Makefile b/lang/sablevm-sdk/Makefile
index 4608feb2a89f7c9d279f2134fb269a74b19f871b..a18008e897f7623dbf1c9bcc18747ca6cdd6e29d 100644 (file)
--- a/lang/sablevm-sdk/Makefile
+++ b/lang/sablevm-sdk/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006,2007 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/sablevm
 PKG_MD5SUM:=18a7c1a92b0748a206f9767a76a6b3bb
 
+PKG_BUILD_PARALLEL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/sablevm/Default
@@ -64,8 +66,8 @@ define Build/Configure
        )
        $(call Build/Configure/Default, \
                --srcdir="./../sablevm" \
-               --with-fastjar=/usr/bin/fastjar \
-               --with-jikes=/usr/bin/jikes \
+               --with-fastjar=$$$$(which fastjar) \
+               --with-jikes=$$$$(which jikes) \
                --with-internal-libffi=yes \
                --with-internal-libpopt=no \
                ,\
@@ -74,8 +76,8 @@ define Build/Configure
        )
        $(call Build/Configure/Default, \
                --srcdir=./../sablevm-classpath \
-               --with-fastjar=/usr/bin/fastjar \
-               --with-jikes=/usr/bin/jikes \
+               --with-fastjar=$$$$(which fastjar) \
+               --with-jikes=$$$$(which jikes) \
                --disable-gtk-peer \
                --disable-gtk-cairo \
                --without-x \
@@ -84,12 +86,17 @@ define Build/Configure
        )
 endef
 
-define Build/Compile   
+define Build/Compile
+       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+               EARLY_CONFIGURE= \
+               EXTRA_CONFIGURE= \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               all
        $(MAKE) -C $(PKG_BUILD_DIR) \
                EARLY_CONFIGURE= \
                EXTRA_CONFIGURE= \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
+               install
        $(CP) ./files/mini.classlist $(PKG_BUILD_DIR)/sablevm-classpath/lib/
        ( cd $(PKG_BUILD_DIR)/sablevm-classpath/lib; \
                fastjar -Mcf mini.jar -@ < mini.classlist; \
@@ -126,12 +133,12 @@ define Package/sablevm-mini/install
                $(1)/usr/share/sablevm/examples/
 endef
 
-$(eval $(call BuildPackage,sablevm))
-$(eval $(call BuildPackage,sablevm-mini))
-
 $(foreach command, jikes fastjar, \
   $(eval $(call RequireCommand,$(command), \
    $(PKG_NAME) requires $(command). \
   )) \
 )
 
+$(eval $(call BuildPackage,sablevm))
+$(eval $(call BuildPackage,sablevm-mini))
+