Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d1a7278ccc6e18716d21849b794a8b415c03cbc1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d1a7278ccc6e18716d21849b794a8b415c03cbc1)
  • Date: Wed, 23 Dec 2015 13:56:36 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

http/firefox/BUILD | 11 ++++++-----
http/firefox/CONFIGURE | 5 ++++-
http/firefox/HISTORY | 9 +++++++++
http/firefox/PRE_BUILD | 14 ++++++++++----
4 files changed, 29 insertions(+), 10 deletions(-)

New commits:
commit d1a7278ccc6e18716d21849b794a8b415c03cbc1
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

firefox: fixup of debugging/stripping and switch for the humongous SDK
binaries,
also preferring -Os now to prevent frequent segfauls

diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index f19c0de..a42b11c 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -11,11 +11,12 @@ export LIBGL_ALWAYS_INDIRECT=1

#
# No fast optimization for Mozilla, bit us so many times...
-#
-CFLAGS="${CFLAGS//-Os/-O2}" &&
-CXXFLAGS="${CXXFLAGS//-Os/-O2}" &&
-CFLAGS="${CFLAGS//-O3/-O2}" &&
-CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
+# This used to default to -O2, but that produces crashing firefox for
+# sobukus with gcc-5.2.0; -Os seems more safe.
+CFLAGS="${CFLAGS//-O2/-Os}" &&
+CXXFLAGS="${CXXFLAGS//-O2/-Os}" &&
+CFLAGS="${CFLAGS//-O3/-Os}" &&
+CXXFLAGS="${CXXFLAGS//-O3/-Os}" &&

#
# fix symbol check in build scripts, firefox adds -s to LDFLAGS so we can
diff --git a/http/firefox/CONFIGURE b/http/firefox/CONFIGURE
index d4324a9..8de4865 100755
--- a/http/firefox/CONFIGURE
+++ b/http/firefox/CONFIGURE
@@ -6,7 +6,10 @@ be restricted in distributing these binaries IAW mozilla
policies" n &&
config_query FIREFOX_SAFE "Enable safe browsing (anti-phishing)
implementation?" n &&

config_query FIREFOX_STRIP \
- 'Remove debugging symbols?' \
+ 'Remove debugging symbols (they are BIG, stripped by
upstream default)?' \
+ y
+config_query FIREFOX_SDK \
+ 'Install SDK (including a non-stripped huge copy of
libxul.so)?' \
n &&
config_query FIREFOX_PGO \
'Enable profile guided optimizations (takes twice as
long to build)?' \
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 2a8c44c..2c18499 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,12 @@
+2015-12-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE, PRE_BUILD: revisit the stripping mozconfig, including
+ a switch to disable the installation of a huge unstripped copy in
form of
+ the SDK regardless of FIREFOX_STRIP. Now my Firefox is about 90
MiB, not
+ approaching 900 MiB. Replaced strange sed lines in PRE_BUILD with
+ simple appending, as that is what is needed
+ * BUILD: change CFLAGS hacking, avoid -O2 and higher, crashes with
gcc-5.x,
+ -Os now safer (see https://bugs.gentoo.org/show_bug.cgi?id=568706)
+
2015-11-03 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 42.0, SECURITY_PATCH++,
(MFSA-2015-[116-133])
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 0c294da..06e8c94 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -8,18 +8,24 @@ patch -p1 < $SPELL_DIRECTORY/install_dir.patch &&
cp -v $SPELL_DIRECTORY/mozconfig .mozconfig &&

if [[ "$FIREFOX_SAFE" == "y" ]]; then
- sed -i '27iac_add_options --enable-safe-browsing' .mozconfig
+ echo 'ac_add_options --enable-safe-browsing' >> .mozconfig
else
- sed -i '27iac_add_options --disable-safe-browsing' .mozconfig
+ echo 'ac_add_options --disable-safe-browsing' >> .mozconfig
fi &&

+# Be explicit: stripped install is the default.
if [[ "$FIREFOX_STRIP" == "y" ]]; then
- sed -i '27iac_add_options --enable-strip' .mozconfig
+ echo 'ac_add_options --enable-install-strip' >> .mozconfig
+else
+ echo 'ac_add_options --disable-install-strip' >> .mozconfig
fi &&

+if [[ "$FIREFOX_SDK" == "n" ]]; then
+ sed -i 's/^\(INSTALL_SDK = .*\)$/#\1/' browser/installer/Makefile.in
+fi &&

if [[ $FIREFOX_OFFICIAL == y ]]; then
- sed -i '27iac_add_options --enable-official-branding' .mozconfig || return
1
+ echo 'ac_add_options --enable-official-branding' >> .mozconfig
fi &&

if [[ $FIREFOX_PGO == y ]]; then



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d1a7278ccc6e18716d21849b794a8b415c03cbc1), Thomas Orgis, 12/23/2015

Archive powered by MHonArc 2.6.24.

Top of Page