diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-02-09 16:00:23 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-02-09 16:00:23 +0900 |
| commit | 5ce840383da7cf82ffa7dfaeda187f3fe3d591a7 (patch) | |
| tree | f93fb33cde2a62aa414b61dca085f3fd0613aaca /build-aux | |
| parent | d9f0d99e31569835e295b990029c6dd19554299c (diff) | |
| download | gpg2-5ce840383da7cf82ffa7dfaeda187f3fe3d591a7.tar.gz gpg2-5ce840383da7cf82ffa7dfaeda187f3fe3d591a7.tar.bz2 gpg2-5ce840383da7cf82ffa7dfaeda187f3fe3d591a7.zip | |
Imported Upstream version 2.1.22upstream/2.1.22
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/Vagrantfile | 36 | ||||
| -rw-r--r-- | build-aux/speedo.mk | 4 | ||||
| -rw-r--r-- | build-aux/speedo/w32/g4wihelp.c | 5 |
3 files changed, 42 insertions, 3 deletions
diff --git a/build-aux/Vagrantfile b/build-aux/Vagrantfile new file mode 100644 index 0000000..e4252aa --- /dev/null +++ b/build-aux/Vagrantfile @@ -0,0 +1,36 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +# This Vagrantfile installs all build dependencies for speedo and runs it to compile all of gnupg. + +$script = <<SCRIPT +echo I am provisioning... +export DEBIAN_FRONTEND noninteractive +apt-get update -q -q +apt-get install --yes rsync build-essential git gpg automake autoconf gettext libtool +apt-get install --yes libz-dev libbz2-dev libldap2-dev libsqlite3-dev libgnutls28-dev libcurl4-gnutls-dev libreadline-dev librsvg2-bin libusb-1.0-0-dev +apt-get install --yes texinfo transfig fig2dev imagemagick file ghostscript swig doxygen graphviz +apt-get install --yes pkg-config autopoint python-all-dev python3-all-dev qtbase5-dev +(cd /tmp; rsync -rvazp /vagrant .) +(cd /tmp/vagrant; autoreconf -f -i) +(cd /tmp/vagrant/build-aux; make -f speedo.mk native INSTALL_PREFIX=/tmp/install SELFCHECK=0) +(cd /tmp/vagrant/build-aux/PLAY/build/gnupg; make check-all) +SCRIPT + +Vagrant.configure("2") do |config| + config.vm.box = "debian/stretch64" + + # Use .. for mount. Also, Force NFS vers=3 (instead vers=4) for Debian 8. + config.vm.synced_folder "..", "/vagrant", :mount_options => ['nolock,vers=3,tcp,noatime'] + + config.vm.provider "libvirt" do |libvirt| + libvirt.nested = true + libvirt.cpus = 1 + libvirt.cpu_mode = "host-model" + libvirt.memory = 1024 + libvirt.storage :file, :path => 'vms.qcow2', :size => '1G' + end + + config.vm.provision "shell", inline: $script + +end diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk index c799863..76f712f 100644 --- a/build-aux/speedo.mk +++ b/build-aux/speedo.mk @@ -1127,10 +1127,10 @@ dist-source: installer (set -e;\ tarname="$(INST_NAME)-$(INST_VERSION)_$(BUILD_DATESTR).tar" ;\ [ -f "$$tarname" ] && rm "$$tarname" ;\ - tar -C $(topsrc) -cf "$$tarname" --exclude-backups --exclude-vc \ + tar -C $(topsrc) -cf "$$tarname" --exclude-backups --exclude-vcs \ --transform='s,^\./,$(INST_NAME)-$(INST_VERSION)/,' \ --anchored --exclude './PLAY' . ;\ - tar --totals -rf "$$tarname" --exclude-backups --exclude-vc \ + tar --totals -rf "$$tarname" --exclude-backups --exclude-vcs \ --transform='s,^,$(INST_NAME)-$(INST_VERSION)/,' \ PLAY/stamps/stamp-*-00-unpack PLAY/src swdb.lst swdb.lst.sig ;\ [ -f "$$tarname".xz ] && rm "$$tarname".xz;\ diff --git a/build-aux/speedo/w32/g4wihelp.c b/build-aux/speedo/w32/g4wihelp.c index d62d036..626f3f1 100644 --- a/build-aux/speedo/w32/g4wihelp.c +++ b/build-aux/speedo/w32/g4wihelp.c @@ -1159,7 +1159,10 @@ path_remove (HWND hwndParent, int string_size, char *variables, free (path); if (! changed) - return; + { + free (path_new); + return; + } /* Set a key for our CLSID. */ RegCreateKey (root_key, env_reg, &key_handle); |