Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 http/firefox/BUILD     |    6 ++----
 http/firefox/DEPENDS   |    5 +++--
 http/firefox/HISTORY   |    8 ++++++++
 http/firefox/PRE_BUILD |   28 +++++++++++++++++++++-------
 4 files changed, 34 insertions(+), 13 deletions(-)

New commits:
commit 891c1133185904d88b6b4bb624704fdfaac70c8e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    firefox: Disable jemalloc, gold and elf-hack for musl

commit 9c423c81e100748eafee6fc67060293c9b6d97f4
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    firefox: Add missing dependency on libnotify

commit f8b1ac55b28705c51e369abcabe06e7a872fd133
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    firefox: Explicitly disable profiling if not doing PGO

commit c49b54d5e04e6c636c25540c1bc5b076095f4cce
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    firefox: Improve build times when stripping

commit 3f35aa78c80d60028bd7ae15b8e2b4b1769e13f4
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    firefox: Add missing libvpx and libpng configure flags

commit 4cf1b59c404d149140d06753492a8e49c014c836
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    firefox: Simpilfy cleanup of CFLAGS/CXXFLAGS

diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 5a89db5..ce6fc40 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -16,10 +16,8 @@ export RUSTFLAGS="-C debuginfo=0" &&
 # No fast optimization for Mozilla, bit us so many times...
 # This used to default to -O2, but that produces crashing firefox for
 # sobukus with gcc-5.2.0; -Os seems more safe.
-CFLAGS="${CFLAGS//-Os/-O2}"      &&
-CXXFLAGS="${CXXFLAGS//-Os/-O2}"  &&
-CFLAGS="${CFLAGS//-O3/-O2}"      &&
-CXXFLAGS="${CXXFLAGS//-O3/-O2}"  &&
+CFLAGS="${CFLAGS//-O[3s]/-O2}"      &&
+CXXFLAGS="${CXXFLAGS//-O[3s]/-O2}"  &&
 
 # harden
 LDFLAGS="$LDFLAGS -Wl,-z,now"    &&
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 5019e52..d65556e 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -24,7 +24,7 @@ depends  libxft                                             
     &&
 depends  gdk-pixbuf2                                             &&
 
 depends  libjpeg-turbo "--with-system-jpeg"                      &&
-depends -sub APNG libpng                                         &&
+depends -sub APNG libpng "--with-system-png"                     &&
 depends  librsvg2                                                &&
 depends  libwebp       "--with-system-webp"                      &&
 
@@ -48,8 +48,9 @@ depends  zlib               "--with-system-zlib"            
     &&
 
 depends bzip2               "--with-system-bz2"                  &&
 depends libevent            "--with-system-libevent"             &&
-depends libvpx                                                   &&
+depends libvpx              "--with-system-libvpx"               &&
 depends libffi              "--enable-system-ffi"                &&
+depends libnotify                                                &&
 depends pixman              "--enable-system-pixman"             &&
 
 depends rust                                                     &&
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index f748fc5..cde2393 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,11 @@
+2019-08-26 Ismael Luceno <ismael AT sourcemage.org>
+       * BUILD: Simpilfied cleanup of CFLAGS/CXXFLAGS
+       * DEPENDS: Added missing libvpx and libpng configure flags
+         Added missing dependency on libnotify
+       * PRE_BUILD: Improved build times when stripping
+         Explicitly disable profiling if not doing PGO
+         Disabled jemalloc, gold and elf-hack for musl
+
 2019-08-14 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 68.0.2, SECURITY_PATCH++, (CVE-2019-11733)
 
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 0aefe08..3752626 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -10,10 +10,12 @@ cp -v $SPELL_DIRECTORY/mozconfig .mozconfig &&
 
 # Be explicit: stripped install is the default.
 if [[ "$FIREFOX_STRIP" == "y" ]]; then
-  echo 'ac_add_options --enable-install-strip' >> .mozconfig
+  echo 'ac_add_options --enable-install-strip'
+  echo 'ac_add_options --enable-strip'
+  echo 'ac_add_options --disable-debug-symbols'
 else
-  echo 'ac_add_options --disable-install-strip' >> .mozconfig
-fi &&
+  echo 'ac_add_options --disable-install-strip'
+fi >> .mozconfig &&
 
 if [[ "$FIREFOX_SDK" == "n" ]]; then
   sed -i 's/^\(INSTALL_SDK = .*\)$/#\1/' browser/installer/Makefile.in
@@ -24,13 +26,25 @@ if [[ $FIREFOX_OFFICIAL == y ]]; then
 fi &&
 
 if [[ $FIREFOX_PGO == y ]]; then
-  echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) 
\$(OBJDIR)/_profile/pgo/profileserver.py'" >> .mozconfig
+  echo 'mk_add_options PROFILE_GEN_SCRIPT='\''$(PYTHON) 
$(OBJDIR)/_profile/pgo/profileserver.py'\'
 else
-  echo "ac_add_options --disable-tests" >> .mozconfig 
-fi &&
+  echo "ac_add_options --disable-profiling --disable-tests"
+fi >> .mozconfig &&
 
 if [[ $FIREFOX_WIDEVINE == y ]]; then
   echo "ac_add_options --enable-eme=widevine" >> .mozconfig
 else
   echo "ac_add_options --disable-eme" >> .mozconfig
-fi
+fi &&
+
+case "$HOST" in
+*-musl)
+  cat <<-!>>.mozconfig
+       ac_add_options --disable-elf-hack
+       # jemalloc depends on PTHREAD_MUTEX_ADAPTIVE_NP
+       ac_add_options --disable-jemalloc
+       # gold causes build failures
+       ac_add_options --disable-gold
+!
+  ;;
+esac