Merge branch 'gerow-osx-vagrant' into strawberry-dev

toolchain/toolchain-build.sh

@@ -24,7 +24,7 @@ if [[ "$INSTALL_PACKAGES" == "true" ]] ; then
     echo "If you don't want to do this and you're sure you have all of the required system packages, then interrupt the password prompt and run this script again with -q."
 
     if [ -f /etc/debian_version ]; then
-        sudo apt-get install yasm genext2fs build-essential wget libmpfr-dev libmpc-dev libgmp3-dev qemu autoconf automake texinfo pkg-config
+        sudo apt-get install yasm genext2fs build-essential wget libmpfr-dev libmpc-dev libgmp3-dev qemu autoconf automake texinfo pkg-config git ctags
     elif [ -f /etc/fedora-release ]; then
         sudo yum groupinstall 'Development Tools'
         sudo yum groupinstall 'Development Libraries'
@@ -45,7 +45,9 @@ if [[ "$INSTALL_PACKAGES" == "true" ]] ; then
         echo "  - qemu"
         echo "  - texinfo"
         echo "  - pkg-config"
-        echo "(If you are on Arch, install: clang yasm genext2fs base-devel wget mpfr mpc gmp qemu autoconf automake texinfo pkg-config)"
+        echo "  - git"
+        echo "  - ctags"
+        echo "(If you are on Arch, install: clang yasm genext2fs base-devel wget mpfr mpc gmp qemu autoconf automake texinfo pkg-config git ctags)"
         echo ""
         echo "... then run this script (toolchain/toolchain-build.sh) again with the -q flag."
         exit 1

util/Vagrantfile

@@ -0,0 +1,10 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure(2) do |config|
+  config.vm.box = "ubuntu/trusty64"
+
+  config.vm.provider "virtualbox" do |vb|
+    vb.memory = "1024"
+  end
+end