[tor-commits] [tor-browser-bundle/master] make Tor and the PTs build with our mingw compilers

[mikeperry at torproject.org]

commit e92aa0a6a20117a9badd0c116284e77afd8b9dbb
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Aug 26 11:01:48 2014 -0400

    make Tor and the PTs build with our mingw compilers
---
 gitian/build-helpers/wine-wrappers/dllwrap.py              |    2 +-
 gitian/build-helpers/wine-wrappers/g++.py                  |    2 +-
 gitian/build-helpers/wine-wrappers/gcc.py                  |    2 +-
 gitian/descriptors/windows/gitian-pluggable-transports.yml |    8 ++------
 gitian/descriptors/windows/gitian-tor.yml                  |    8 ++------
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/gitian/build-helpers/wine-wrappers/dllwrap.py b/gitian/build-helpers/wine-wrappers/dllwrap.py
index fdff035..8f339ff 100755
--- a/gitian/build-helpers/wine-wrappers/dllwrap.py
+++ b/gitian/build-helpers/wine-wrappers/dllwrap.py
@@ -10,7 +10,7 @@ import sys
 
 import common
 
-args = ["/usr/bin/i686-w64-mingw32-dllwrap"]
+args = ["/home/ubuntu/install/mingw-w64/bin/i686-w64-mingw32-dllwrap"]
 sys.argv.pop(0)
 while sys.argv:
     a = sys.argv.pop(0)
diff --git a/gitian/build-helpers/wine-wrappers/g++.py b/gitian/build-helpers/wine-wrappers/g++.py
index 4738420..0688285 100755
--- a/gitian/build-helpers/wine-wrappers/g++.py
+++ b/gitian/build-helpers/wine-wrappers/g++.py
@@ -10,7 +10,7 @@ import sys
 
 import common
 
-args = ["/usr/bin/i686-w64-mingw32-g++"]
+args = ["/home/ubuntu/install/mingw-w64/bin/i686-w64-mingw32-g++"]
 sys.argv.pop(0)
 while sys.argv:
     a = sys.argv.pop(0)
diff --git a/gitian/build-helpers/wine-wrappers/gcc.py b/gitian/build-helpers/wine-wrappers/gcc.py
index 493b27b..37bb1d8 100755
--- a/gitian/build-helpers/wine-wrappers/gcc.py
+++ b/gitian/build-helpers/wine-wrappers/gcc.py
@@ -10,7 +10,7 @@ import sys
 
 import common
 
-args = ["/usr/bin/i686-w64-mingw32-gcc"]
+args = ["/home/ubuntu/install/mingw-w64/bin/i686-w64-mingw32-gcc"]
 sys.argv.pop(0)
 while sys.argv:
     a = sys.argv.pop(0)
diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml
index bac9bf0..93776b8 100644
--- a/gitian/descriptors/windows/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml
@@ -11,8 +11,6 @@ packages:
 - "swig"
 - "p7zip-full"
 - "m4"
-- "mingw-w64"
-- "g++-mingw-w64"
 - "python-dev"
 - "faketime"
 - "libtool"
@@ -50,7 +48,7 @@ files:
 - "go.tar.gz"
 - "dzip.sh"
 - "pyc-timestamp.sh"
-- "binutils-win32-utils.zip"
+- "mingw-w64-win32-utils.zip"
 - "openssl-win32-utils.zip"
 - "gmp-win32-utils.zip"
 - "gcclibs-win32-utils.zip"
@@ -81,15 +79,13 @@ script: |
   export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs"
   umask 0022
 
-  unzip -d $INSTDIR binutils-win32-utils.zip
+  unzip -d $INSTDIR mingw-w64-win32-utils.zip
   unzip -d $INSTDIR gmp-win32-utils.zip
   unzip -d $INSTDIR openssl-win32-utils.zip
   unzip -d $INSTDIR gcclibs-win32-utils.zip
   cp $INSTDIR/gmp/bin/*dll* $INSTDIR/Tor
 
   export PATH=$INSTDIR/mingw-w64/bin:$PATH
-  sudo mv /usr/bin/i686-w64-mingw32-ld /usr/bin/i686-w64-mingw32-ld.orig
-  sudo cp $INSTDIR/mingw-w64/bin/i686-w64-mingw32-ld /usr/bin/
 
   # We need at least Wine 1.5.29 which is not in Ubuntu's main repository (see
   # below). Thus, we resort to a PPA and need therefore to determine the correct
diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml
index 65df589..277f2d0 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -11,7 +11,6 @@ packages:
 - "autoconf"
 - "automake"
 - "autoconf2.13"
-- "mingw-w64"
 - "faketime"
 - "libtool"
 reference_datetime: "2000-01-01 00:00:00"
@@ -31,7 +30,7 @@ files:
 - "bug11200-hang-0.2.5.patch"
 - "binutils.tar.bz2"
 - "dzip.sh"
-- "binutils-win32-utils.zip"
+- "mingw-w64-win32-utils.zip"
 - "openssl-win32-utils.zip"
 - "libevent-win32-utils.zip"
 - "zlib-win32-utils.zip"
@@ -48,7 +47,7 @@ script: |
   mkdir -p $INSTDIR/bin/
   mkdir -p $INSTDIR/Tor/
   mkdir -p $INSTDIR/Data/Tor/
-  unzip -d $INSTDIR binutils-win32-utils.zip
+  unzip -d $INSTDIR mingw-w64-win32-utils.zip
   unzip -d $INSTDIR zlib-win32-utils.zip
   unzip -d $INSTDIR libevent-win32-utils.zip
   unzip -d $INSTDIR openssl-win32-utils.zip
@@ -60,9 +59,6 @@ script: |
 
   export PATH=$INSTDIR/mingw-w64/bin:$PATH
 
-  sudo mv /usr/bin/i686-w64-mingw32-ld /usr/bin/i686-w64-mingw32-ld.orig
-  sudo cp $INSTDIR/mingw-w64/bin/i686-w64-mingw32-ld /usr/bin/
-
   # Building tor
   cd tor
   git update-index --refresh -q