commit 3b171fe976d7913697a3dd629352c12a61fbdf93 Author: Nicolas Vigier boklm@torproject.org Date: Fri Sep 24 10:17:06 2021 +0200
Bug 40368: Use system's python3 for building ninja --- projects/ninja/build | 6 ++++-- projects/ninja/config | 1 + 2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/projects/ninja/build b/projects/ninja/build index 57aac77..12f7336 100644 --- a/projects/ninja/build +++ b/projects/ninja/build @@ -5,7 +5,9 @@ distdir=/var/tmp/dist/[% project %] [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), hardened_gcc => 0 }) %] [% END -%] -[% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] +[% IF c("var/linux") -%] + [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] +[% END -%] mkdir /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] @@ -17,7 +19,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] [% END -%] ./configure.py --bootstrap
-mkdir $distdir +mkdir -p $distdir cp ninja $distdir cd /var/tmp/dist [% c('tar', { diff --git a/projects/ninja/config b/projects/ninja/config index 8615511..8e2c245 100644 --- a/projects/ninja/config +++ b/projects/ninja/config @@ -14,3 +14,4 @@ input_files: enable: '[% c("var/linux") %]' - name: python project: python + enable: '[% c("var/linux") %]'