[tor-commits] [tor-browser-bundle/master] Bug 21754: Remove old GCC toolchain and macOS SDK

gk at torproject.org gk at torproject.org
Wed Apr 5 09:05:42 UTC 2017 

commit 11780c5d6d84c860cc9fa389cb08e1bf4680d7de
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Mar 20 09:06:02 2017 +0000

    Bug 21754: Remove old GCC toolchain and macOS SDK
    
    We remove all hints to our old GCC-based toolchain for macOS and switch
    our descriptors to use the 10.7 SDK as 10.9 is the minimum requirement
    for Firefox 52 ESR now.
    
    We clean up the tor macOS descriptor a bit as well, removing unused
    environment variables and replacing '/home/debian' with '$HOME' as done
    in the utils descriptor.
---
 gitian/descriptors/mac/gitian-tor.yml   | 20 ++++++++------------
 gitian/descriptors/mac/gitian-utils.yml |  7 +++----
 gitian/fetch-inputs.sh                  |  6 +++---
 gitian/verify-tags.sh                   |  4 ++--
 gitian/versions                         |  6 ------
 gitian/versions.alpha                   |  6 ------
 gitian/versions.beta                    |  8 ++------
 gitian/versions.nightly                 |  6 ------
 8 files changed, 18 insertions(+), 45 deletions(-)

diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml
index 946f915..2e1fa3e 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -17,7 +17,7 @@ remotes:
 files:
 - "clang-linux64-wheezy-utils.zip"
 - "cctools.tar.gz"
-- "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb"
+- "MacOSX10.7.sdk.tar.gz"
 - "versions"
 - "dzip.sh"
 - "openssl-mac64-utils.zip"
@@ -43,10 +43,8 @@ script: |
   mkdir -p $TORCONFIGDIR/
   mkdir -p $OUTDIR/
 
-  # Extracting and copying all the necessary utilities and libraries. We still
-  # need the 10.6 SDK if we want to support OSX 10.6.
-  ar x apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
-  tar xaf data.tar.gz
+  # Extracting and copying all the necessary utilities and libraries.
+  tar xaf MacOSX10.7.sdk.tar.gz
   tar xaf cctools.tar.gz
   unzip clang-linux64-wheezy-utils.zip
   unzip -d $INSTDIR openssl-mac64-utils.zip
@@ -56,14 +54,12 @@ script: |
 
   # Setting the proper flags and variables
   # ld needs libLTO.so from llvm
-  export LD_LIBRARY_PATH="/home/debian/build/clang/lib"
-  export PATH="/home/debian/build/cctools/bin:$PATH"
-  CROSS_CCTOOLS_PATH="/home/debian/build/cctools"
-  CROSS_SYSROOT="/home/debian/build/usr/lib/apple/SDKs/MacOSX10.6.sdk"
+  export LD_LIBRARY_PATH="$HOME/build/clang/lib"
+  export PATH="$HOME/build/cctools/bin:$PATH"
+  CROSS_CCTOOLS_PATH="$HOME/build/cctools"
+  CROSS_SYSROOT="$HOME/build/MacOSX10.7.sdk"
   FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT"
-  export CC="/home/debian/build/clang/bin/clang $FLAGS"
-  export CPP="/home/debian/build/clang/bin/clang $FLAGS -E"
-  export LLVMCONFIG="/home/debian/build/clang/bin/llvm-config"
+  export CC="$HOME/build/clang/bin/clang $FLAGS"
   export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip"
 
   # Building tor
diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml
index 0025e43..9191c52 100644
--- a/gitian/descriptors/mac/gitian-utils.yml
+++ b/gitian/descriptors/mac/gitian-utils.yml
@@ -23,7 +23,7 @@ remotes:
 - "url": "https://cmake.org/cmake.git"
   "dir": "cmake"
 files:
-- "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb"
+- "MacOSX10.7.sdk.tar.gz"
 - "openssl.tar.gz"
 - "cctools.tar.gz"
 - "versions"
@@ -65,8 +65,7 @@ script: |
   export FAKETIME=$REFERENCE_DATETIME
 
   cd ..
-  ar x apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
-  tar xaf data.tar.gz
+  tar xaf MacOSX10.7.sdk.tar.gz
   tar xaf cctools.tar.gz
 
   # Preparing clang for cross-compilation, setting the proper flags and
@@ -75,7 +74,7 @@ script: |
   export LD_LIBRARY_PATH="$INSTDIR/clang/lib"
   export PATH="$HOME/build/cctools/bin:$PATH"
   CROSS_CCTOOLS_PATH="$HOME/build/cctools"
-  CROSS_SYSROOT="$HOME/build/usr/lib/apple/SDKs/MacOSX10.6.sdk"
+  CROSS_SYSROOT="$HOME/build/MacOSX10.7.sdk"
   FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT"
   export CC="$INSTDIR/clang/bin/clang $FLAGS"
   export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip"
diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index f141381..3be1fa2 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -132,7 +132,7 @@ do
   fi
 done
 
-for i in TOOLCHAIN4_OLD OSXSDK OSXSDK_OLD MSVCR100
+for i in OSXSDK MSVCR100
 do
   PACKAGE="${i}_PACKAGE"
   URL="${MIRROR_URL}${!PACKAGE}"
@@ -173,8 +173,8 @@ done
 wget -U "" -N ${NOSCRIPT_URL}
 
 # Verify packages with weak or no signatures via direct sha256 check
-# (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all)
-for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN
+# (OpenSSL is signed with MD5, and OSXSDK are not signed at all)
+for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN
 do
    PACKAGE="${i}_PACKAGE"
    HASH="${i}_HASH"
diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh
index 4b17550..f1d89d4 100755
--- a/gitian/verify-tags.sh
+++ b/gitian/verify-tags.sh
@@ -148,8 +148,8 @@ do
 done
 
 # Verify packages with weak or no signatures via direct sha256 check
-# (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all)
-for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN
+# (OpenSSL is signed with MD5, and OSXSDK are not signed at all)
+for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN
 do
    PACKAGE="${i}_PACKAGE"
    HASH="${i}_HASH"
diff --git a/gitian/versions b/gitian/versions
index 69abeb3..cbc323e 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -74,10 +74,8 @@ NSIS_VER=2.51
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
 NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi
-TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 CCTOOLS_PACKAGE=cctools.tar.gz
 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz
-OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
 MSVCR100_PACKAGE=msvcr100.dll
 BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2
 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2
@@ -105,8 +103,6 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf
 OPENSSL_HASH=4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088
 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
-OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
-TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
 NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390
 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
@@ -133,9 +129,7 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa
 ## Non-git package URLs
 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
 GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE}
-TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE}
 CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PACKAGE}
-OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_PACKAGE}
 BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}
 GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}
 NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIPT_PACKAGE}
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 3539d59..8a0e184 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -77,10 +77,8 @@ NSIS_VER=2.51
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
 NOSCRIPT_PACKAGE=noscript_security_suite-2.9.5.3-fx+sm.xpi
-TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 CCTOOLS_PACKAGE=cctools.tar.gz
 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz
-OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
 MSVCR100_PACKAGE=msvcr100.dll
 BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2
 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2
@@ -108,8 +106,6 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf
 OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0
 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
-OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
-TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
 NOSCRIPT_HASH=ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd
 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
@@ -136,9 +132,7 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa
 ## Non-git package URLs
 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
 GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE}
-TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE}
 CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PACKAGE}
-OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_PACKAGE}
 BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}
 GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}
 NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIPT_PACKAGE}
diff --git a/gitian/versions.beta b/gitian/versions.beta
index d7db1fd..e962c20 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -60,9 +60,8 @@ GO_VER=1.7.4
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.22-sm+fx+fn.xpi
-TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
-OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
 MINGW_PACKAGE=mingw-w64-svn-snapshot.zip
+OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz
 MSVCR100_PACKAGE=msvcr100.dll
 BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2
 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2
@@ -87,8 +86,7 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf
 # Hashes for packages with weak sigs or no sigs
 OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028
 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
-OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
-TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
+OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
 NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08
 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
@@ -112,8 +110,6 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa
 ## Non-git package URLs
 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
 GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE}
-TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE}
-OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_PACKAGE}
 BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}
 GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}
 NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE}
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 2045034..c7fb5bf 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -84,10 +84,8 @@ NSIS_VER=2.51
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
 NOSCRIPT_PACKAGE=noscript_security_suite-2.9.5.3-fx+sm.xpi
-TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 CCTOOLS_PACKAGE=cctools.tar.gz
 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz
-OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
 MSVCR100_PACKAGE=msvcr100.dll
 BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2
 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2
@@ -115,8 +113,6 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf
 OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0
 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
-OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
-TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
 NOSCRIPT_HASH=ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd
 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
@@ -143,9 +139,7 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa
 ## Non-git package URLs
 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
 GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE}
-TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE}
 CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PACKAGE}
-OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_PACKAGE}
 BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}
 GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}
 NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIPT_PACKAGE}

More information about the tor-commits mailing list