commit 57f544ca8590b00b609b62132aeb2ae7abfa7779 Author: Nicolas Vigier <boklm@torproject.org> Date: Thu Feb 1 13:10:08 2018 +0100 Bug 25111: Don't compile Yasm on our own anymore for Windows Tor Browser --- projects/firefox/build | 4 ---- projects/firefox/config | 3 --- projects/yasm/build | 14 -------------- projects/yasm/config | 12 ------------ 4 files changed, 33 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 81d4d1c..051d573 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -12,10 +12,6 @@ # compiler setup so that mingw is first in the PATH. export LD_LIBRARY_PATH=$hgccdir/lib64 export PATH=$hgccdir/bin:$PATH - - # Firefox ESR52 needs Yasm >= 1.2.0 which Ubuntu Precise does not ship. - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/yasm') %] - export PATH="/var/tmp/dist/yasm/bin:$PATH" [% END -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] diff --git a/projects/firefox/config b/projects/firefox/config index 4157500..f19b8ac 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -94,8 +94,5 @@ input_files: - project: gcc name: gcc enable: '[% c("var/windows") %]' - - project: yasm - name: yasm - enable: '[% c("var/windows") %]' - filename: STL_win64.patch enable: '[% c("var/windows-x86_64") %]' diff --git a/projects/yasm/build b/projects/yasm/build deleted file mode 100644 index c11924c..0000000 --- a/projects/yasm/build +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir=/var/tmp/dist/[% project %] -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/[% c('input_files_by_name/yasm') %] -cd /var/tmp/build/yasm-[% c("version") %] -./configure --prefix="$distdir" -make -j[% c("buildconf/num_procs") %] -make install -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/yasm/config b/projects/yasm/config deleted file mode 100644 index 12d009b..0000000 --- a/projects/yasm/config +++ /dev/null @@ -1,12 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 1.2.0 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -var: - container: - use_container: 1 - -input_files: - - project: container-image - - URL: 'https://www.tortall.net/projects/yasm/releases/yasm-[% c("version") %].tar.gz' - name: yasm - sha256sum: 768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31