[tor-commits] [tor-browser-build/master] Bug 26462: Unbreak Firefox 60 ESR 32bit Linux compilation

[gk at torproject.org]

commit 7dc74d1652c560e193d1a4c3331efcfb08ee67b0
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jun 22 21:16:14 2018 +0000

    Bug 26462: Unbreak Firefox 60 ESR 32bit Linux compilation
    
    For some reason the switch from 60.0.1esr to 60.1.0esr is causing
    to break our builds because the 32bit linker is not capable of linking
    gkrust nor libxul due to address space limitations anymore.
    
    We keep the configuration for 32bit Linux bundles as we shipped them in
    our nightly builds over the past couple of weeks but are avoiding
    building browser debug information for now.
---
 projects/firefox/build                | 4 ++--
 projects/firefox/mozconfig-linux-i686 | 3 +--
 projects/tor-browser/build            | 4 +++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index 9f849b0..f023c6d 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -202,7 +202,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/
 
 cd $distdir
 
-[% IF c("var/linux") %]
+[% IF c("var/linux-x86_64") %]
   # Strip and generate debuginfo for the firefox binary that we keep, all *.so
   # files, the plugin-container, and the updater (see ticket #10126)
   for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/updater
@@ -244,7 +244,7 @@ END;
         tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser.tar.gz',
     }) %]
 
-[% IF c("var/linux") %]
+[% IF c("var/linux-x86_64") %]
 [% c('tar', {
         tar_src => [ 'Debug' ],
         tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser-debug.tar.xz',
diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686
index b677df3..ec0adb9 100755
--- a/projects/firefox/mozconfig-linux-i686
+++ b/projects/firefox/mozconfig-linux-i686
@@ -24,10 +24,9 @@ ac_add_options --enable-tor-browser-update
 ac_add_options --enable-signmar
 ac_add_options --enable-verify-mar
 
-ac_add_options --disable-strip
-ac_add_options --disable-install-strip
 ac_add_options --disable-tests
 ac_add_options --disable-debug
+ac_add_options --disable-debug-symbols
 ac_add_options --disable-maintenance-service
 ac_add_options --disable-crashreporter
 ac_add_options --disable-webrtc
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index f3ed949..4c06412 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -300,8 +300,10 @@ cd $distdir
 rm -rf $distdir/${PKG_DIR}
 
 cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/
-[% IF c("var/linux") -%]
+[% IF c("var/linux-x86_64") -%]
   cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.xz "$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.xz
+[% END -%]
+[% IF c("var/linux") -%]
   cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz
 [% END -%]