[tor-commits] [tor-browser-bundle/master] Bug 16210: Fix paths and stripping for ESR 38

[gk at torproject.org]

commit ccb9a005e959b9812b654a9fd0c9d4937e051030
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Jun 17 09:04:34 2015 +0000

    Bug 16210: Fix paths and stripping for ESR 38
    
    In addition to fixing broken paths and stripping Linux binaries we
    exempt |python 2.7| from libfaketime due to #13877, too.
---
 gitian/descriptors/linux/gitian-firefox.yml |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml
index e7c8bfa..05b2beb 100644
--- a/gitian/descriptors/linux/gitian-firefox.yml
+++ b/gitian/descriptors/linux/gitian-firefox.yml
@@ -38,7 +38,6 @@ files:
 script: |
   source versions
   INSTDIR="$HOME/install"
-  export LIBRARY_PATH="$INSTDIR/lib"
   export CFLAGS="-frandom-seed=tor"
   export CXXFLAGS="-frandom-seed=tor"
   export TZ=UTC
@@ -91,6 +90,7 @@ script: |
   #
   mkdir -p $INSTDIR/Browser/
   mkdir -p $INSTDIR/Debug/Browser/components
+  mkdir -p $INSTDIR/Debug/Browser/browser/components
 
   # Building libfaketime
   cd faketime
@@ -115,9 +115,10 @@ script: |
   # BUT we need to exclude |make build| from it. Otherwise the build fails close
   # to the end, see #12461 comment 8 and later. Additionally, we need to avoid
   # breaking the ICU compilation. Exlcuding |bash| helps here. See #12461
-  # comment 13.
+  # comment 13. Finally, we need to exclude |python2.7| as not doing so would
+  # stall the build right at the beginning. See #13877.
   export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1"
-  export FAKETIME_SKIP_CMDS="bash,make"
+  export FAKETIME_SKIP_CMDS="python2.7,bash,make"
   find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
   make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build
   # Packaging is broken with libfaketime enabled, thus we disable it again. See
@@ -158,9 +159,9 @@ script: |
   cp -p mar-tools-linux${GBUILD_BITS}.zip $OUTDIR/
   #
   # Strip and generate debuginfo for the firefox binary that we keep, all *.so
-  # files, and the plugin-container (see ticket #10126)
+  # files, the plugin-container, and the updater (see ticket #10126)
   cd $INSTDIR
-  for LIB in Browser/*.so Browser/webapprt-stub Browser/mozilla-xremote-client Browser/firefox Browser/plugin-container Browser/components/*.so # Browser/updater
+  for LIB in Browser/*.so Browser/webapprt-stub Browser/firefox Browser/plugin-container Browser/components/*.so Browser/browser/components/*.so Browser/updater
   do
     objcopy --only-keep-debug $LIB Debug/$LIB
     strip $LIB