[tor-commits] [tor-browser-build/master] Bug 31538: Bump CMake version

[boklm at torproject.org]

commit cd111df46540c3727697bac62898a4c141752080
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Sep 13 06:50:07 2019 +0000

    Bug 31538: Bump CMake version
    
    The old CMake version built libraries like libc++.a and libc++abi.a in a
    non-reproducible way. Using the latest CMake version solves that.
    
    We need to use our own GCC for Linux as the shippped one is too old.
---
 projects/cmake/build  | 6 +++++-
 projects/cmake/config | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/projects/cmake/build b/projects/cmake/build
index a5eca23..e8613a2 100644
--- a/projects/cmake/build
+++ b/projects/cmake/build
@@ -1,7 +1,11 @@
 #!/bin/bash
 [% c("var/set_default_env") -%]
 distdir=/var/tmp/dist/[% project %]
-mkdir -p /var/tmp/build
+[% IF c("var/linux") %]
+  [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'),
+                              hardened_gcc => 0 }) %]
+[% END -%]
+mkdir /var/tmp/build
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 cd /var/tmp/build/[% project %]-[% c('version') %]
 ./bootstrap --prefix=$distdir
diff --git a/projects/cmake/config b/projects/cmake/config
index 492b99c..fd8d186 100644
--- a/projects/cmake/config
+++ b/projects/cmake/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 3.4.3
+version: 3.15.3
 git_url: https://cmake.org/cmake.git
 git_hash: 'v[% c("version") %]'
 tag_gpg_id: 1
@@ -11,3 +11,6 @@ var:
 
 input_files:
   - project: container-image
+  - name: '[% c("var/compiler") %]'
+    project: '[% c("var/compiler") %]'
+    enable: '[% c("var/linux") %]'