wok diff squeak-vm/receipt @ rev 16434

Merge branches
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Apr 18 13:51:05 2014 +0300 (2014-04-18)
parents e48fb758c6d8
children 6135577f4d08
line diff
     1.1 --- a/squeak-vm/receipt	Sat Apr 12 13:55:15 2014 +0200
     1.2 +++ b/squeak-vm/receipt	Fri Apr 18 13:51:05 2014 +0300
     1.3 @@ -12,16 +12,23 @@
     1.4  WGET_URL="http://squeakvm.org/unix/release/$TARBALL"
     1.5  HOST_ARCH="i486 arm"
     1.6  
     1.7 -SUGGESTED=""
     1.8 +SUGGESTED="scratch"
     1.9  DEPENDS="alsa-lib dbus xorg-libXrender"
    1.10 -BUILD_DEPENDS="alsa-lib-dev dbus-dev xorg-libXrender-dev cmake"
    1.11 +BUILD_DEPENDS="alsa-lib-dev dbus-dev xorg-libXrender-dev"
    1.12 +
    1.13 +# Use build host cmake when cross compiling
    1.14 +case "$ARCH" in
    1.15 +	i?86) BUILD_DEPENDS="$BUILD_DEPENDS cmake" ;;
    1.16 +	arm) ARCH_ARGS="--without-SqueakFFIPrims" ;;
    1.17 +esac
    1.18  
    1.19  # Rules to configure and make the package.
    1.20  compile_rules()
    1.21  {
    1.22 -	./unix/cmake/configure \
    1.23 +	./unix/cmake/configure ${ARCH_ARGS} \
    1.24  		--prefix=/usr \
    1.25  		--without-quartz \
    1.26 +		--without-gl \
    1.27  		--with-x \
    1.28  		--enable-mpg-mmx &&
    1.29  	make && make DESTDIR=${DESTDIR} install