Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (ee87132aa46feb5f86694f6feefbe1ae08df429b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (ee87132aa46feb5f86694f6feefbe1ae08df429b)
  • Date: Wed, 23 Jul 2014 07:06:02 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

http/firefox/BUILD | 17 ++++++++++++++++-
http/firefox/CONFIGURE | 3 +++
http/firefox/HISTORY | 4 ++++
http/firefox/Makefile.in-pgo.patch | 10 ++++++++++
http/firefox/PRE_BUILD | 5 +++++
5 files changed, 38 insertions(+), 1 deletion(-)

New commits:
commit ee87132aa46feb5f86694f6feefbe1ae08df429b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

http/firefox: add option for profiled build

diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 03db091..a1decaa 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -3,6 +3,14 @@ cd $SOURCE_DIRECTORY/mozilla* &&
FIREFOX_HOME="$INSTALL_ROOT/usr/lib/firefox" &&
export MOZ_PHOENIX=1 &&

+unset DBUS_SESSION_BUS_ADDRESS \
+ DISPLAY \
+ ORBIT_SOCKETDIR \
+ SESSION_MANAGER \
+ XDG_SESSION_COOKIE \
+ XAUTHORITY &&
+export LIBGL_ALWAYS_INDIRECT=1
+
#
# No fast optimization for Mozilla, bit us so many times...
#
@@ -28,6 +36,13 @@ for option in $OPTS; do
echo "ac_add_options $option" >> .mozconfig
done &&

+local MAKE_TARGET
+if [[ $FIREFOX_PGO == y ]]; then
+ MAKE_TARGET=profiledbuild
+else
+ MAKE_TARGET=build
+fi &&
+
make_single &&
-make -f client.mk build &&
+make -f client.mk $MAKE_TARGET &&
make_normal
diff --git a/http/firefox/CONFIGURE b/http/firefox/CONFIGURE
index 704b84d..d4324a9 100755
--- a/http/firefox/CONFIGURE
+++ b/http/firefox/CONFIGURE
@@ -7,4 +7,7 @@ config_query FIREFOX_SAFE "Enable safe browsing
(anti-phishing) implementation?"

config_query FIREFOX_STRIP \
'Remove debugging symbols?' \
+ n &&
+config_query FIREFOX_PGO \
+ 'Enable profile guided optimizations (takes twice as
long to build)?' \
n
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 36082c1..ecd97be 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2014-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, BUILD, CONFIGURE, PRE_BUILD, Makefile.in-pgo.patch:
+ add option for profiled build
+
2014-07-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 31.0

diff --git a/http/firefox/Makefile.in-pgo.patch
b/http/firefox/Makefile.in-pgo.patch
new file mode 100644
index 0000000..3679dd9
--- /dev/null
+++ b/http/firefox/Makefile.in-pgo.patch
@@ -0,0 +1,10 @@
+--- Makefile.in.old 2014-01-27 08:45:10.795890277 +1300
++++ Makefile.in 2014-01-27 08:51:22.170242862 +1300
+@@ -205,3 +205,7 @@
+ $(call SUBMAKE,$@,js/src)
+ endif
+ endif
++
++
++pgo-profile-run:
++ $(PYTHON) $(topsrcdir)/build/pgo/profileserver.py $(EXTRA_TEST_ARGS)
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 6d4f7c4..db7ca75 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -22,4 +22,9 @@ fi &&

if [[ $FIREFOX_OFFICIAL == y ]]; then
sed -i '27iac_add_options --enable-official-branding' .mozconfig || return
1
+fi &&
+
+if [[ $FIREFOX_PGO == y ]]; then
+ echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON)
\$(OBJDIR)/_profile/pgo/profileserver.py'" >> .mozconfig &&
+ patch -p0 < ${SPELL_DIRECTORY}/Makefile.in-pgo.patch
fi



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (ee87132aa46feb5f86694f6feefbe1ae08df429b), Florian Franzmann, 07/23/2014

Archive powered by MHonArc 2.6.24.

Top of Page