From 7266988dd61ac1d88ecc411514ec22ed7016dc07 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 1 Jun 2018 13:23:20 +1000 Subject: [PATCH] Vagrant: use Qt5.9.3 deps --- .vagrantconfig.yml | 14 +++++++------- Vagrantfile | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.vagrantconfig.yml b/.vagrantconfig.yml index bd54ba4c3..05aa5ba22 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 a3df179e6..c2c9c326e 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)) -- 2.22.0