[tor-commits] [tor-browser-bundle/master] Bug 16351: Update our GCC version to 5.1.0

gk at torproject.org gk at torproject.org
Mon Jun 29 15:22:38 UTC 2015


commit 11bcfffc3e9b806d3c37e68730f7e2096f499bff
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Jun 29 15:19:43 2015 +0000

    Bug 16351: Update our GCC version to 5.1.0
    
    The original plan was to bump Binutils to 2.25, too. But there are more
    reproducibility issues involved than anticipated (for the timestamps
    related one see the last two reverted commits).
---
 gitian/descriptors/windows/gitian-utils.yml |    5 -----
 gitian/versions                             |    4 ++--
 gitian/versions.alpha                       |    4 ++--
 gitian/versions.nightly                     |    4 ++--
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml
index 6e52c67..ae938af 100644
--- a/gitian/descriptors/windows/gitian-utils.yml
+++ b/gitian/descriptors/windows/gitian-utils.yml
@@ -28,7 +28,6 @@ files:
 - "gmp.tar.bz2"
 - "enable-reloc-section-ld.patch"
 - "peXXigen.patch"
-- "gcc-dev-random.patch"
 - "versions"
 - "dzip.sh"
 script: |
@@ -74,10 +73,6 @@ script: |
   mkdir gcc
   cd gcc
   tar -xjvf ../gcc.tar.bz2
-  cd gcc-*
-  # Don't use /dev/random on Windows. See bug 13169 for details.
-  patch -p1 < ../../gcc-dev-random.patch
-  cd ..
   # We don't want to link against msvcrt.dll due to bug 9084.
   i686-w64-mingw32-g++ -dumpspecs > ~/build/msvcr100.spec
   sed 's/msvcrt/msvcr100/' -i ~/build/msvcr100.spec
diff --git a/gitian/versions b/gitian/versions
index d4f18d1..02e6217 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -40,7 +40,7 @@ GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
 FIREFOX_LANG_BUILD=build2
 BINUTILS_VER=2.24
-GCC_VER=4.9.1
+GCC_VER=5.1.0
 PYTHON_VER=2.7.5
 PYCRYPTO_VER=2.6.1
 ARGPARSE_VER=1.2.1
@@ -98,7 +98,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c
 SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b
-GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e
+GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad
 
 ## Non-git package URLs
 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index e7564d7..cee61cd 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -40,7 +40,7 @@ GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
 FIREFOX_LANG_BUILD=build1
 BINUTILS_VER=2.24
-GCC_VER=4.9.1
+GCC_VER=5.1.0
 PYTHON_VER=2.7.5
 PYCRYPTO_VER=2.6.1
 ARGPARSE_VER=1.2.1
@@ -98,7 +98,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c
 SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b
-GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e
+GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad
 
 ## Non-git package URLs
 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index e2dc33b..1a0ce0a 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -43,7 +43,7 @@ GMP_VER=5.1.3
 FIREFOX_LANG_VER=38.0.1esr #$FIREFOX_VERSION
 FIREFOX_LANG_BUILD=build2
 BINUTILS_VER=2.24
-GCC_VER=4.9.1
+GCC_VER=5.1.0
 PYTHON_VER=2.7.5
 PYCRYPTO_VER=2.6.1
 ARGPARSE_VER=1.2.1
@@ -101,7 +101,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c
 SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b
-GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e
+GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad
 
 ## Non-git package URLs
 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}



More information about the tor-commits mailing list