[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor-browser-bundle/master] Bug 21328: Updating to clang 3.8.0

To: tor-commits@xxxxxxxxxxxxxxxxxxxx, tbb-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor-browser-bundle/master] Bug 21328: Updating to clang 3.8.0
From: gk@xxxxxxxxxxxxxx
Date: Wed, 5 Apr 2017 09:05:42 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 05 Apr 2017 05:06:14 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>
commit cd4465477ac10d2b740d5a32505cdab5a197e405
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Date:   Fri Mar 31 17:21:51 2017 +0000

    Bug 21328: Updating to clang 3.8.0
    
    We use the new compiler Mozilla is using for Firefox 52 cross-builds as
    well. clang now requires GCC 4.8.5 for compiling which is not available
    in Debian Wheezy. We therefore build the macOS parts on Debian Jessie
    now.
---
 gitian/descriptors/mac/gitian-bundle.yml           |   2 +-
 gitian/descriptors/mac/gitian-firefox.yml          |   7 +++---
 .../mac/gitian-pluggable-transports.yml            |   6 ++---
 gitian/descriptors/mac/gitian-tor.yml              |   8 +++---
 gitian/descriptors/mac/gitian-utils.yml            |  27 ++++++++++++++-------
 gitian/fetch-inputs.sh                             |   8 +++---
 gitian/gpg/CFE.gpg                                 | Bin 0 -> 2507 bytes
 gitian/gpg/LIBCXX.gpg                              | Bin 0 -> 2507 bytes
 gitian/gpg/LIBCXXABI.gpg                           | Bin 0 -> 2507 bytes
 gitian/gpg/LLVM.gpg                                | Bin 0 -> 2507 bytes
 gitian/mkbundle-mac.sh                             |   6 ++---
 gitian/verify-tags.sh                              |   4 +--
 gitian/versions                                    |  12 ++++++---
 gitian/versions.alpha                              |  12 ++++++---
 gitian/versions.nightly                            |  12 ++++++---
 15 files changed, 65 insertions(+), 39 deletions(-)

diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml
index 571c6e0..8c7bbfc 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -2,7 +2,7 @@
 name: "bundle-mac"
 distro: "debian"
 suites:
-- "wheezy"
+- "jessie"
 architectures:
 - "amd64"
 packages:
diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml
index aae6139..6355485 100644
--- a/gitian/descriptors/mac/gitian-firefox.yml
+++ b/gitian/descriptors/mac/gitian-firefox.yml
@@ -2,7 +2,7 @@
 name: "torbrowser-mac"
 distro: "debian"
 suites:
-- "wheezy"
+- "jessie"
 architectures:
 - "amd64"
 packages:
@@ -16,7 +16,7 @@ remotes:
 - "url": "https://git.torproject.org/tor-browser.git";
   "dir": "tor-browser"
 files:
-- "clang-linux64-wheezy-utils.zip"
+- "clang-linux64-jessie-utils.zip"
 - "cctools.tar.gz"
 - "MacOSX10.7.sdk.tar.gz"
 - "get-moz-build-date"
@@ -39,7 +39,7 @@ script: |
   # Extracting all the necessary tools
   tar xaf ../MacOSX10.7.sdk.tar.gz
   tar xaf ../cctools.tar.gz
-  unzip ../clang-linux64-wheezy-utils.zip
+  unzip ../clang-linux64-jessie-utils.zip
   # Bug 20439: build with PIE
   # If we add -fPIE to the FLAGS, the build fails in js/src/ctypes/libffi
   # with libtool giving an error:
@@ -96,7 +96,6 @@ script: |
   ~/build/fix-info-plist.py $TORBROWSER_VERSION $COPYRIGHT_YEAR < tmp.plist > $INFO_PLIST
   rm -f tmp.plist
   ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/omni.ja
-  ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/webapprt/omni.ja
   ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/browser/omni.ja
   cd TorBrowser.app/
   ~/build/dzip.sh tor-browser-mac${GBUILD_BITS}-gbuilt.zip ./Contents
diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml
index c6846cc..c430bb8 100644
--- a/gitian/descriptors/mac/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml
@@ -2,7 +2,7 @@
 name: "pluggable-transports-mac"
 distro: "debian"
 suites:
-- "wheezy"
+- "jessie"
 architectures:
 - "amd64"
 packages:
@@ -28,7 +28,7 @@ files:
 - "versions"
 - "go14.tar.gz"
 - "go.tar.gz"
-- "clang-linux64-wheezy-utils.zip"
+- "clang-linux64-jessie-utils.zip"
 - "cctools.tar.gz"
 - "MacOSX10.7.sdk.tar.gz"
 - "dzip.sh"
@@ -54,7 +54,7 @@ script: |
   mkdir -p $OUTDIR/
   #
   tar xaf cctools.tar.gz
-  unzip clang-linux64-wheezy-utils.zip
+  unzip clang-linux64-jessie-utils.zip
   # The 10.7 SDK is needed for Go: https://bugs.torproject.org/20023#comment:6
   tar xaf MacOSX10.7.sdk.tar.gz
   # Preparing clang for cross-compilation, setting the proper flags and
diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml
index 2e1fa3e..cb3e99b 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -2,7 +2,7 @@
 name: "tor-mac"
 distro: "debian"
 suites:
-- "wheezy"
+- "jessie"
 architectures:
 - "amd64"
 packages:
@@ -15,7 +15,7 @@ remotes:
 - "url": "https://git.torproject.org/tor.git";
   "dir": "tor"
 files:
-- "clang-linux64-wheezy-utils.zip"
+- "clang-linux64-jessie-utils.zip"
 - "cctools.tar.gz"
 - "MacOSX10.7.sdk.tar.gz"
 - "versions"
@@ -46,7 +46,7 @@ script: |
   # 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 clang-linux64-jessie-utils.zip
   unzip -d $INSTDIR openssl-mac64-utils.zip
   unzip -d $INSTDIR libevent-mac64-utils.zip
   cp $INSTDIR/libevent/lib/libevent-*.dylib $TORBINDIR/
@@ -70,7 +70,7 @@ script: |
   ./autogen.sh
   find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
   ./configure --enable-static-openssl --disable-asciidoc --host=x86_64-apple-darwin10 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR
-  export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+  export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1
   make $MAKEOPTS
   make install
   cd $INSTDIR
diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml
index 9191c52..33a8bf2 100644
--- a/gitian/descriptors/mac/gitian-utils.yml
+++ b/gitian/descriptors/mac/gitian-utils.yml
@@ -2,11 +2,10 @@
 name: "utils-mac"
 distro: "debian"
 suites:
-- "wheezy"
+- "jessie"
 architectures:
 - "amd64"
 packages:
-- "faketime"
 - "automake"
 - "libtool"
 - "zip"
@@ -16,14 +15,14 @@ remotes:
   "dir": "libevent"
 - "url": "https://github.com/wolfcw/libfaketime";
   "dir": "faketime"
-- "url": "https://github.com/llvm-mirror/llvm";
-  "dir": "llvm"
-- "url": "https://github.com/llvm-mirror/clang";
-  "dir": "clang"
 - "url": "https://cmake.org/cmake.git";
   "dir": "cmake"
 files:
 - "MacOSX10.7.sdk.tar.gz"
+- "llvm.tar.xz"
+- "cfe.tar.xz"
+- "libcxx.tar.xz"
+- "libcxxabi.tar.xz"
 - "openssl.tar.gz"
 - "cctools.tar.gz"
 - "versions"
@@ -44,8 +43,18 @@ script: |
   export PATH=$PATH:$INSTDIR/cmake/bin
 
   # Clang
-  cd ../llvm
-  mv ../clang tools/
+  cd ..
+  tar xaf llvm.tar.xz
+  tar xaf cfe.tar.xz
+  tar xaf libcxx.tar.xz
+  tar xaf libcxxabi.tar.xz
+  mv cfe-* clang
+  mv libcxx-* libcxx
+  mv libcxxabi-* libcxxabi
+  mv clang llvm-*/tools
+  mv libcxx llvm-*/projects
+  mv libcxxabi llvm-*/projects
+  cd llvm-*
   export LLVM_HOME=`pwd`
   mkdir build
   cd build
@@ -108,7 +117,7 @@ script: |
 
   # Grabbing the results
   cd $INSTDIR
-  ~/build/dzip.sh clang-$CLANG_VER-linux64-wheezy-utils.zip clang
+  ~/build/dzip.sh clang-$CLANG_VER-linux64-jessie-utils.zip clang
   ~/build/dzip.sh openssl-$OPENSSL_VER-mac64-utils.zip openssl
   ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-mac64-utils.zip libevent
   cp *utils.zip $OUTDIR/
diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 3be1fa2..44f96aa 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -113,7 +113,7 @@ update_git() {
 
 ##############################################################################
 # Get+verify sigs that exist
-for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP
+for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP LLVM CFE LIBCXX LIBCXXABI
 do
   PACKAGE="${i}_PACKAGE"
   URL="${i}_URL"
@@ -233,6 +233,10 @@ ln -sf "$NOSCRIPT_PACKAGE" noscript@xxxxxxxxxxxxxxxx
 ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz
 ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2
 ln -sf "$GCC_PACKAGE" gcc.tar.bz2
+ln -sf "$LLVM_PACKAGE" llvm.tar.xz
+ln -sf "$CFE_PACKAGE" cfe.tar.xz
+ln -sf "$LIBCXX_PACKAGE" libcxx.tar.xz
+ln -sf "$LIBCXXABI_PACKAGE" libcxxabi.tar.xz
 ln -sf "$PYTHON_MSI_PACKAGE" python.msi
 ln -sf "$PYCRYPTO_PACKAGE" pycrypto.tar.gz
 ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz
@@ -275,8 +279,6 @@ torbutton             https://git.torproject.org/torbutton.git            $TORBU
 tor-launcher          https://git.torproject.org/tor-launcher.git         $TORLAUNCHER_TAG
 tor-browser           https://git.torproject.org/tor-browser.git          $TORBROWSER_TAG
 cmake                 https://cmake.org/cmake.git                         $CMAKE_TAG
-llvm                  https://github.com/llvm-mirror/llvm                 $LLVM_TAG
-clang                 https://github.com/llvm-mirror/clang                $CLANG_TAG
 mingw-w64-git         http://git.code.sf.net/p/mingw-w64/mingw-w64        $MINGW_TAG
 pyptlib               https://git.torproject.org/pluggable-transports/pyptlib.git $PYPTLIB_TAG
 obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPROXY_TAG
diff --git a/gitian/gpg/CFE.gpg b/gitian/gpg/CFE.gpg
new file mode 100644
index 0000000..9911f65
Binary files /dev/null and b/gitian/gpg/CFE.gpg differ
diff --git a/gitian/gpg/LIBCXX.gpg b/gitian/gpg/LIBCXX.gpg
new file mode 100644
index 0000000..9911f65
Binary files /dev/null and b/gitian/gpg/LIBCXX.gpg differ
diff --git a/gitian/gpg/LIBCXXABI.gpg b/gitian/gpg/LIBCXXABI.gpg
new file mode 100644
index 0000000..9911f65
Binary files /dev/null and b/gitian/gpg/LIBCXXABI.gpg differ
diff --git a/gitian/gpg/LLVM.gpg b/gitian/gpg/LLVM.gpg
new file mode 100644
index 0000000..9911f65
Binary files /dev/null and b/gitian/gpg/LLVM.gpg differ
diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh
index 789cc80..7f02f05 100755
--- a/gitian/mkbundle-mac.sh
+++ b/gitian/mkbundle-mac.sh
@@ -135,7 +135,7 @@ fi
 
 cd $GITIAN_DIR
 
-if [ ! -f inputs/clang-$CLANG_VER-linux64-wheezy-utils.zip -o \
+if [ ! -f inputs/clang-$CLANG_VER-linux64-jessie-utils.zip -o \
      ! -f inputs/openssl-$OPENSSL_VER-mac64-utils.zip -o \
      ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip ];
 then
@@ -151,7 +151,7 @@ then
 
   cd inputs
   cp -a ../build/out/*-utils.zip .
-  ln -sf clang-$CLANG_VER-linux64-wheezy-utils.zip clang-linux64-wheezy-utils.zip
+  ln -sf clang-$CLANG_VER-linux64-jessie-utils.zip clang-linux64-jessie-utils.zip
   ln -sf openssl-$OPENSSL_VER-mac64-utils.zip openssl-mac64-utils.zip
   ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip libevent-mac64-utils.zip
   cd ..
@@ -164,7 +164,7 @@ else
   # We might have built the utilities in the past but maybe the links are
   # pointing to the wrong version. Refresh them.
   cd inputs
-  ln -sf clang-$CLANG_VER-linux64-wheezy-utils.zip clang-linux64-wheezy-utils.zip
+  ln -sf clang-$CLANG_VER-linux64-jessie-utils.zip clang-linux64-jessie-utils.zip
   ln -sf openssl-$OPENSSL_VER-mac64-utils.zip openssl-mac64-utils.zip
   ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip libevent-mac64-utils.zip
   cd ..
diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh
index f1d89d4..4facfa5 100755
--- a/gitian/verify-tags.sh
+++ b/gitian/verify-tags.sh
@@ -110,8 +110,6 @@ EOF
 while read dir commit; do
   check_git_hash "$dir" "$commit"
 done << EOF
-llvm                    $LLVM_TAG
-clang                   $CLANG_TAG
 mingw-w64-git           $MINGW_TAG
 libdmg-hfsplus          $LIBDMG_TAG
 libfte                  $LIBFTE_TAG
@@ -130,7 +128,7 @@ uniuri                  $UNIURI_TAG
 EOF
 
 # Verify signatures on signed packages
-for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP
+for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP LLVM CFE LIBCXX LIBCXXABI
 do
   PACKAGE="${i}_PACKAGE"
   URL="${i}_URL"
diff --git a/gitian/versions b/gitian/versions
index cbc323e..cf07564 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -23,8 +23,6 @@ NSIS_TAG=v0.3.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.22-stable
 CMAKE_TAG=v2.8.12.2
-LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74  # r247539
-CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539
 MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8
 PYPTLIB_TAG=pyptlib-0.0.6
 OBFSPROXY_TAG=obfsproxy-0.2.12
@@ -55,7 +53,7 @@ FIREFOX_LANG_VER=$FIREFOX_VERSION
 FIREFOX_LANG_BUILD=build2
 BINUTILS_VER=2.24
 GCC_VER=5.1.0
-CLANG_VER=r247539
+CLANG_VER=3.8.0
 PYTHON_VER=2.7.5
 PYCRYPTO_VER=2.6.1
 ARGPARSE_VER=1.2.1
@@ -79,6 +77,10 @@ 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
+LLVM_PACKAGE=llvm-${CLANG_VER}.src.tar.xz
+CFE_PACKAGE=cfe-${CLANG_VER}.src.tar.xz
+LIBCXX_PACKAGE=libcxx-${CLANG_VER}.src.tar.xz
+LIBCXXABI_PACKAGE=libcxxabi-${CLANG_VER}.src.tar.xz
 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi
 PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz
 ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz
@@ -132,6 +134,10 @@ GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE}
 CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PACKAGE}
 BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}
 GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}
+LLVM_URL=http://releases.llvm.org/${CLANG_VER}/${LLVM_PACKAGE} # no proper HTTPS
+CFE_URL=http://releases.llvm.org/${CLANG_VER}/${CFE_PACKAGE} # no proper HTTPS
+LIBCXX_URL=http://releases.llvm.org/${CLANG_VER}/${LIBCXX_PACKAGE} # no proper HTTPS
+LIBCXXABI_URL=http://releases.llvm.org/${CLANG_VER}/${LIBCXXABI_PACKAGE} # no proper HTTPS
 NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIPT_PACKAGE}
 PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE}
 PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_PACKAGE}
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 8a0e184..b677fd1 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -23,8 +23,6 @@ NSIS_TAG=v0.3.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.22-stable
 CMAKE_TAG=v2.8.12.2
-LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74  # r247539
-CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539
 MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8
 PYPTLIB_TAG=pyptlib-0.0.6
 OBFSPROXY_TAG=obfsproxy-0.2.12
@@ -58,7 +56,7 @@ FIREFOX_LANG_VER=$FIREFOX_VERSION
 FIREFOX_LANG_BUILD=build2
 BINUTILS_VER=2.24
 GCC_VER=5.1.0
-CLANG_VER=r247539
+CLANG_VER=3.8.0
 PYTHON_VER=2.7.5
 PYCRYPTO_VER=2.6.1
 ARGPARSE_VER=1.2.1
@@ -82,6 +80,10 @@ 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
+LLVM_PACKAGE=llvm-${CLANG_VER}.src.tar.xz
+CFE_PACKAGE=cfe-${CLANG_VER}.src.tar.xz
+LIBCXX_PACKAGE=libcxx-${CLANG_VER}.src.tar.xz
+LIBCXXABI_PACKAGE=libcxxabi-${CLANG_VER}.src.tar.xz
 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi
 PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz
 ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz
@@ -135,6 +137,10 @@ GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE}
 CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PACKAGE}
 BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}
 GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}
+LLVM_URL=http://releases.llvm.org/${CLANG_VER}/${LLVM_PACKAGE} # no proper HTTPS
+CFE_URL=http://releases.llvm.org/${CLANG_VER}/${CFE_PACKAGE} # no proper HTTPS
+LIBCXX_URL=http://releases.llvm.org/${CLANG_VER}/${LIBCXX_PACKAGE} # no proper HTTPS
+LIBCXXABI_URL=http://releases.llvm.org/${CLANG_VER}/${LIBCXXABI_PACKAGE} # no proper HTTPS
 NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIPT_PACKAGE}
 PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE}
 PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_PACKAGE}
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index c7fb5bf..7a57980 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -30,8 +30,6 @@ NSIS_TAG=v0.3.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.22-stable
 CMAKE_TAG=v2.8.12.2
-LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74  # r247539
-CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539
 MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8
 PYPTLIB_TAG=master
 OBFSPROXY_TAG=master
@@ -65,7 +63,7 @@ FIREFOX_LANG_VER=$FIREFOX_VERSION
 FIREFOX_LANG_BUILD=build2
 BINUTILS_VER=2.24
 GCC_VER=5.1.0
-CLANG_VER=r247539
+CLANG_VER=3.8.0
 PYTHON_VER=2.7.5
 PYCRYPTO_VER=2.6.1
 ARGPARSE_VER=1.2.1
@@ -89,6 +87,10 @@ 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
+LLVM_PACKAGE=llvm-${CLANG_VER}.src.tar.xz
+CFE_PACKAGE=cfe-${CLANG_VER}.src.tar.xz
+LIBCXX_PACKAGE=libcxx-${CLANG_VER}.src.tar.xz
+LIBCXXABI_PACKAGE=libcxxabi-${CLANG_VER}.src.tar.xz
 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi
 PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz
 ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz
@@ -142,6 +144,10 @@ GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE}
 CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PACKAGE}
 BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}
 GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}
+LLVM_URL=http://releases.llvm.org/${CLANG_VER}/${LLVM_PACKAGE} # no proper HTTPS
+CFE_URL=http://releases.llvm.org/${CLANG_VER}/${CFE_PACKAGE} # no proper HTTPS
+LIBCXX_URL=http://releases.llvm.org/${CLANG_VER}/${LIBCXX_PACKAGE} # no proper HTTPS
+LIBCXXABI_URL=http://releases.llvm.org/${CLANG_VER}/${LIBCXXABI_PACKAGE} # no proper HTTPS
 NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIPT_PACKAGE}
 PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE}
 PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_PACKAGE}

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
Prev by Author: [tor-commits] [tor-browser-bundle/master] Bump sandboxed to browser tag to 0.0.6
Next by Author: [tor-commits] [tor-browser-bundle/master] Bug 21710: Upgrade Go to 1.8.1.
Previous by thread: [tor-commits] [tor-browser-bundle/master] Bug 19783: Remove unused macOS helper scripts
Next by thread: [tor-commits] [tor-browser-bundle/master] Bug 10369: Don't use old GCC toolchain anymore for utils
Index(es):
- Author
- Thread