From 821fba8cb0bd56db35b6bc0c7b45f5a24b27a47c Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Wed, 17 Aug 2016 17:50:01 +0200 Subject: [PATCH] use patched LDLP-preserving pyinstaller, fixes #1416 see https://github.com/pyinstaller/pyinstaller/pull/2148 also: use waf --no-lsb (the bootloader does not build without it on our wheezy32 vagrant VM) --- Vagrantfile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 17853bfa3..539ed3818 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -248,10 +248,13 @@ def install_pyinstaller_bootloader(boxname) . borg-env/bin/activate git clone https://github.com/pyinstaller/pyinstaller.git cd pyinstaller - git checkout v3.1.1 + # develop branch, merge commit of ThomasWaldmann/do-not-overwrite-LD_LP + git checkout 639fcec992d753db2058314b843bccc37b815265 # build bootloader, if it is not included cd bootloader - python ./waf all + # XXX temporarily use --no-lsb as we have no LSB environment + # XXX https://github.com/borgbackup/borg/issues/1506 + python ./waf --no-lsb all cd .. pip install -e . EOF @@ -392,7 +395,8 @@ Vagrant.configure(2) do |config| b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("wheezy32") b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("wheezy32") b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("wheezy32") - b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller("wheezy32") + # XXX https://github.com/borgbackup/borg/issues/1506 + b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller_bootloader("wheezy32") b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("wheezy32") b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("wheezy32") end @@ -405,7 +409,8 @@ Vagrant.configure(2) do |config| b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("wheezy64") b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("wheezy64") b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("wheezy64") - b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller("wheezy64") + # XXX https://github.com/borgbackup/borg/issues/1506 + b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller_bootloader("wheezy64") b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("wheezy64") b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("wheezy64") end