[tor-commits] [tor-messenger-build/master] Use Ubuntu Utopic (14.10) to cross-compile the Windows version

boklm at torproject.org boklm at torproject.org
Thu Apr 23 13:43:13 UTC 2015


commit 6ce118765424e11e5239fc8d4353b8fd0be72073
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Apr 23 15:34:57 2015 +0200

    Use Ubuntu Utopic (14.10) to cross-compile the Windows version
    
    The mozilla build requires GCC >= 4.7 as the host compiler, so we need
    to build a newer GCC or use a more recent distro. Utopic has GCC 4.9.1.
    
    https://hg.mozilla.org/mozilla-central/rev/a0f267629f11
---
 projects/binutils/config     |    4 ++--
 projects/instantbird/config  |    6 +++---
 projects/libgcrypt/config    |    6 +++---
 projects/libgpg-error/config |    6 +++---
 projects/libotr/config       |    6 +++---
 projects/mingw-w64/config    |    4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/projects/binutils/config b/projects/binutils/config
index caa0514..be5f0f1 100644
--- a/projects/binutils/config
+++ b/projects/binutils/config
@@ -18,8 +18,8 @@ targets:
       configure_opt: '--target=i686-w64-mingw32 --disable-multilib'
     lsb_release:
       id: Ubuntu
-      release: 12.04
-      codename: precise
+      release: 14.10
+      codename: utopic
 
 input_files:
   - URL: https://ftp.gnu.org/gnu/binutils/binutils-[% c("version") %].tar.bz2
diff --git a/projects/instantbird/config b/projects/instantbird/config
index 0edbf91..b26ce01 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -12,7 +12,7 @@ var:
   archive_suffix: tar.bz2
   deps:
     - build-essential
-    - libmpc2
+    - libmpc-dev
     - autotools-dev
     - autoconf2.13
     - python
@@ -34,8 +34,8 @@ targets:
   windows-i686:
     lsb_release:
       id: Ubuntu
-      release: 12.04
-      codename: precise
+      release: 14.10
+      codename: utopic
     var:
       archive_suffix: zip
       arch_deps:
diff --git a/projects/libgcrypt/config b/projects/libgcrypt/config
index 269e483..d079326 100644
--- a/projects/libgcrypt/config
+++ b/projects/libgcrypt/config
@@ -9,13 +9,13 @@ lsb_release:
 var:
   deps:
     - build-essential
-    - libmpc2
+    - libmpc-dev
 targets:
   windows-i686:
     lsb_release:
       id: Ubuntu
-      release: 12.04
-      codename: precise
+      release: 14.10
+      codename: utopic
     var:
       arch_deps:
         - gettext
diff --git a/projects/libgpg-error/config b/projects/libgpg-error/config
index 0f749ff..2f5a1af 100644
--- a/projects/libgpg-error/config
+++ b/projects/libgpg-error/config
@@ -9,13 +9,13 @@ lsb_release:
 var:
   deps:
     - build-essential
-    - libmpc2
+    - libmpc-dev
 targets:
   windows-i686:
     lsb_release:
       id: Ubuntu
-      release: 12.04
-      codename: precise
+      release: 14.10
+      codename: utopic
     var:
       arch_deps:
         - gettext
diff --git a/projects/libotr/config b/projects/libotr/config
index c709497..ed174e0 100644
--- a/projects/libotr/config
+++ b/projects/libotr/config
@@ -9,14 +9,14 @@ lsb_release:
 var:
   deps:
     - build-essential
-    - libmpc2
+    - libmpc-dev
     - file
 targets:
   windows-i686:
     lsb_release:
       id: Ubuntu
-      release: 12.04
-      codename: precise
+      release: 14.10
+      codename: utopic
     var:
       arch_deps:
         - gettext
diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config
index 31ec1f1..f75e03f 100644
--- a/projects/mingw-w64/config
+++ b/projects/mingw-w64/config
@@ -7,8 +7,8 @@ version: '[% c("abbrev") %]'
 remote_docker: 1
 lsb_release:
   id: Ubuntu
-  release: 12.04
-  codename: precise
+  release: 14.10
+  codename: utopic
 var:
   gcc_version: 4.9.1
   deps:



More information about the tor-commits mailing list