commit 4097d931d0fd5a0376ca57437c2cdd76adf62d57 Author: Nicolas Vigier boklm@torproject.org Date: Wed Mar 13 12:25:19 2019 +0100
Bug 29758: Build firefox debug symbols for linux-i686
This reverts commit 7dc74d1652c560e193d1a4c3331efcfb08ee67b0. --- projects/firefox/build | 4 ++-- projects/firefox/mozconfig-linux-i686 | 3 ++- projects/tor-browser/build | 4 +--- 3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/projects/firefox/build b/projects/firefox/build index f3d3c27..9bc025a 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -259,7 +259,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/
cd $distdir
-[% IF c("var/linux-x86_64") %] +[% IF c("var/linux") %] # 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.real Browser/plugin-container Browser/updater @@ -303,7 +303,7 @@ END; tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser.tar.gz', }) %]
-[% IF c("var/linux-x86_64") %] +[% IF c("var/linux") %] [% 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 abc7b0e..ef952aa 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -27,9 +27,10 @@ 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 4661f7a..fc64ee1 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -316,10 +316,8 @@ rm -rf $distdir/${PKG_DIR} SCRIPT_EOF
cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ -[% 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/firefox') %]/tor-browser-debug.tar.xz "$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.xz cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz [% END -%]