commit 460d5ef80d2bb7ebf808574d21ec7fe43dd9dd01 Author: Georg Koppen gk@torproject.org Date: Sun Jun 2 20:33:22 2019 +0000

Bug 30734: Add nasm project --- projects/nasm/build | 24 ++++++++++++++++++++++++ projects/nasm/config | 17 +++++++++++++++++ 2 files changed, 41 insertions(+)

diff --git a/projects/nasm/build b/projects/nasm/build new file mode 100644 index 0000000..0e6ca04 --- /dev/null +++ b/projects/nasm/build @@ -0,0 +1,24 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +[% IF c("var/linux") %] + # We need a link to our GCC, otherwise the system cc gets used which points to + # /usr/bin/gcc. + [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), + hardened_gcc => 0 }) %] + ln -s gcc /var/tmp/dist/gcc/bin/cc + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] + export PATH="/var/tmp/dist/binutils/bin:$PATH" +[% END -%] +distdir=/var/tmp/dist/[% project %] +tar -xf [% project %]-[% c('version') %].tar.xz +cd [% project %]-[% 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/nasm/config b/projects/nasm/config new file mode 100644 index 0000000..ff82004 --- /dev/null +++ b/projects/nasm/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: 2.14.02 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +var: + container: + use_container: 1 + +input_files: + - project: container-image + - project: binutils + name: binutils + enable: '[% c("var/linux") %]' + - project: '[% c("var/compiler") %]' + name: '[% c("var/compiler") %]' + enable: '[% c("var/linux") %]' + - URL: 'https://www.nasm.us/pub/nasm/releasebuilds/%5B% c("version") %]/nasm-[% c("version") %].tar.xz' + sha256sum: e24ade3e928f7253aa8c14aa44726d1edf3f98643f87c9d72ec1df44b26be8f5