[tbb-commits] [tor-browser-bundle/master] Bug 13588: Ship only libgmp?10.* for FTE.

[gk at torproject.org]

commit b6be76ce511a9346d3cd7f12c998095ee58a1da8
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Nov 19 14:16:27 2014 +0000

    Bug 13588: Ship only libgmp?10.* for FTE.
    
    FTE seems to not need libgmpxx anymore. Additionally, we don't need
    multiple copies of libgmp either. We remove all these unnecessary
    libraries to save space and reduce complexity. Bug 13055 gets fixed by
    this commit as well.
---
 gitian/descriptors/linux/gitian-pluggable-transports.yml   |    3 ++-
 gitian/descriptors/linux/gitian-utils.yml                  |    2 ++
 gitian/descriptors/mac/gitian-pluggable-transports.yml     |    3 ++-
 gitian/descriptors/mac/gitian-utils.yml                    |    2 ++
 gitian/descriptors/windows/gitian-pluggable-transports.yml |    5 +++--
 gitian/descriptors/windows/gitian-utils.yml                |    2 ++
 6 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml
index daa1225..6c5d742 100644
--- a/gitian/descriptors/linux/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml
@@ -74,7 +74,8 @@ script: |
 
   unzip -d $INSTDIR gmp-linux$GBUILD_BITS-utils.zip
   unzip -d $INSTDIR openssl-linux$GBUILD_BITS-utils.zip
-  cp $INSTDIR/gmp/lib/*.so* $INSTDIR/Tor
+  # FTE only needs libgmp-10.so and no libgmpxx anymore.
+  cp $INSTDIR/gmp/lib/libgmp-10.so $INSTDIR/Tor
 
   # Building go
   # http://golang.org/doc/install/source#environment
diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml
index 0c5e38c..8a41c5a 100644
--- a/gitian/descriptors/linux/gitian-utils.yml
+++ b/gitian/descriptors/linux/gitian-utils.yml
@@ -126,6 +126,8 @@ script: |
   tar xjf gmp.tar.bz2
   cd gmp-*
   find -type f | xargs touch --date="$REFERENCE_DATETIME"
+  # Even if we are not shipping libgmpxx anymore we still need --enable-xcc
+  # during compile time.
   ./configure --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx
   make
   make install
diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml
index 6201230..0931c59 100644
--- a/gitian/descriptors/mac/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml
@@ -71,7 +71,8 @@ script: |
   export PATH="$PATH:$HOME/build/apple-osx/bin/"
   unzip -d $INSTDIR gmp-mac64-utils.zip
   unzip -d $INSTDIR openssl-mac64-utils.zip
-  cp $INSTDIR/gmp/lib/*dylib* $TBDIR/Tor/
+  # FTE only needs libgmp.10.dylib and no libgmpxx anymore.
+  cp $INSTDIR/gmp/lib/libgmp.10.dylib $TBDIR/Tor/
 
   #
   export AR=$HOME/build/apple-osx/bin/i686-apple-darwin11-ar
diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml
index f96b5ec..6729eeb 100644
--- a/gitian/descriptors/mac/gitian-utils.yml
+++ b/gitian/descriptors/mac/gitian-utils.yml
@@ -67,6 +67,8 @@ script: |
   tar xjf gmp.tar.bz2
   cd gmp-*
   find -type f | xargs touch --date="$REFERENCE_DATETIME"
+  # Even if we are not shipping libgmpxx anymore we still need --enable-xcc
+  # during compile time.
   ./configure --host=x86_64-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx
   make
   make install
diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml
index bd3189b..70d4b91 100644
--- a/gitian/descriptors/windows/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml
@@ -88,7 +88,8 @@ script: |
   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
+  # FTE only needs libgmp-10.dll and no libgmpxx anymore.
+  cp $INSTDIR/gmp/bin/libgmp-10.dll $INSTDIR/Tor
 
   export PATH=$INSTDIR/mingw-w64/bin:$PATH
 
@@ -281,7 +282,7 @@ script: |
   # Building libfte
   cd libfte
   ln -s $INSTDIR/gmp thirdparty/gmp
-  cp -a $INSTDIR/gmp/bin/libgmp-*.dll .
+  cp -a $INSTDIR/gmp/bin/libgmp-10.dll .
   find -type f | xargs touch --date="$REFERENCE_DATETIME"
   LD_PRELOAD= WINDOWS_BUILD=1 CROSS_COMPILE=1 PYTHON=$INSTPYTHON make
   LD_PRELOAD= $INSTPYTHON setup.py install
diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml
index f0deca0..7846e59 100644
--- a/gitian/descriptors/windows/gitian-utils.yml
+++ b/gitian/descriptors/windows/gitian-utils.yml
@@ -141,6 +141,8 @@ script: |
   tar xjf gmp.tar.bz2
   cd gmp-*
   find -type f | xargs touch --date="$REFERENCE_DATETIME"
+  # Even if we are not shipping libgmpxx anymore we still need --enable-xcc
+  # during compile time.
   ./configure --prefix=$INSTDIR/gmp --host=i686-w64-mingw32 --enable-cxx --disable-static --enable-shared
   make
   make install