switching android builder to debian jessie

3 files changed, 5 insertions, 14 deletions

diff --git a/standalone/android/buildchroot b/standalone/android/buildchroot
index 396beab78..e64bdd03d 100755
--- a/standalone/android/buildchroot
+++ b/standalone/android/buildchroot
@@ -5,7 +5,7 @@ if [ "$(whoami)" != root ]; then
 	exit 1
 fi
 
-debootstrap --arch=i386 stable debian-stable-android
+debootstrap --arch=i386 jessie debian-stable-android
 cp $0-inchroot debian-stable-android/tmp
 cp $0-inchroot-asuser debian-stable-android/tmp
 cp $(dirname $0)/abiversion debian-stable-android/tmp
diff --git a/standalone/android/buildchroot-inchroot b/standalone/android/buildchroot-inchroot
index 5c462d8cc..8300999b5 100755
--- a/standalone/android/buildchroot-inchroot
+++ b/standalone/android/buildchroot-inchroot
@@ -10,23 +10,18 @@ fi
 # java needs this mounted to work
 mount -t proc proc /proc || true
 
-echo "deb-src http://ftp.us.debian.org/debian stable main" >> /etc/apt/sources.list
+echo "deb-src http://ftp.us.debian.org/debian jessie main" >> /etc/apt/sources.list
 apt-get update
 apt-get -y install build-essential ghc git libncurses5-dev cabal-install
 apt-get -y install happy alex
-apt-get -y install llvm-3.0 # not 3.1; buggy on arm. 3.2 is ok too
+apt-get -y install llvm-3.4
 apt-get -y install ca-certificates curl file m4 autoconf zlib1g-dev
 apt-get -y install libgnutls-dev libxml2-dev libgsasl7-dev pkg-config c2hs
 apt-get -y install ant default-jdk rsync wget gnupg lsof
 apt-get -y install gettext unzip python
-apt-get -y install locales
-# works around a dependncy issue with the current hjsmin
-apt-get -y install libghc-hjsmin-dev
+apt-get -y install locales automake
 echo en_US.UTF-8 UTF-8 >> /etc/locale.gen
 locale-gen
 apt-get clean
-wget http://snapshot.debian.org/archive/debian/20130903T155330Z/pool/main/a/automake-1.14/automake_1.14-1_all.deb
-dpkg -i automake*.deb
-rm *.deb
 useradd builder --create-home || true
 su builder -c $0-asuser
diff --git a/standalone/android/buildchroot-inchroot-asuser b/standalone/android/buildchroot-inchroot-asuser
index fd27f3fc5..a7bea231a 100755
--- a/standalone/android/buildchroot-inchroot-asuser
+++ b/standalone/android/buildchroot-inchroot-asuser
@@ -13,15 +13,11 @@ fi
 
 cd
 rm -rf .ghc .cabal .android
-cabal update
-cabal install happy alex --bindir=$HOME/bin
-PATH=$HOME/bin:$PATH
-export PATH
 mkdir -p .android
 cd .android
 git clone https://github.com/joeyh/ghc-android
 cd ghc-android
-git checkout stable-ghc-snapshot
+git checkout jessie-ghc-snapshot
 ./build
 
 # This saves 2 gb, and the same sources are in build-*/ghc