diff --git a/.vagrantconfig.yml b/.vagrantconfig.yml index bd54ba4c39b89ccec0ef21960814576a943b08cf..05aa5ba22c08411f0e0b1b35c622d5da9f48dfda 100644 --- a/.vagrantconfig.yml +++ b/.vagrantconfig.yml @@ -1,13 +1,13 @@ configs: dev: - 'qt_deps_tarball': 'Qt5.9.1-linux-vagrant.tar.bz2' + 'qt_deps_tarball': 'Qt5.9.3-gcc_64-min.tar.bz2' 'qt_deps_unpack_parent_dir': '/tmp' - 'qt_deps_unpack_dir': '/tmp/Qt5.9-vagrant/5.9.1' - 'qt_deps_bin_unpack_dir': '/tmp/Qt5.9-vagrant/5.9.1/gcc_64/bin' - 'qt_deps_lib_unpack_dir': '/tmp/Qt5.9-vagrant/5.9.1/gcc_64/lib' - 'qt_deps_plugins_unpack_dir': '/tmp/Qt5.9-vagrant/5.9.1/gcc_64/plugins' - 'qt_deps_qml_unpack_dir': '/tmp/Qt5.9-vagrant/5.9.1/gcc_64/qml' + 'qt_deps_unpack_dir': '/tmp/Qt5.9-gcc_64/5.9.3' + 'qt_deps_bin_unpack_dir': '/tmp/Qt5.9-gcc_64/5.9.3/gcc_64/bin' + 'qt_deps_lib_unpack_dir': '/tmp/Qt5.9-gcc_64/5.9.3/gcc_64/lib' + 'qt_deps_plugins_unpack_dir': '/tmp/Qt5.9-gcc_64/5.9.3/gcc_64/plugins' + 'qt_deps_qml_unpack_dir': '/tmp/Qt5.9-gcc_64/5.9.3/gcc_64/qml' 'project_root_dir': '/vagrant' @@ -20,4 +20,4 @@ configs: 'spec': 'linux-g++-64' 'shadow_build_dir': '/vagrant/shadow-build' 'pro': '/vagrant/qgroundcontrol.pro' - 'deps_url': 'https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.9.1-linux-vagrant.tar.bz2' + 'deps_url': 'https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.9.3-gcc_64-min.tar.bz2' diff --git a/Vagrantfile b/Vagrantfile index a3df179e62ca9ac7c92c5ce68233df413e7794b9..c2c9c326ec006a5a7e819c92ed2a9dcfef53f840 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -45,6 +45,7 @@ Vagrant.configure(2) do |config| $config_shell = <<-'SHELL' set -e + set -x export %{build_env} export JOBS=$((`cat /proc/cpuinfo | grep -c ^processor`+1))