Author: lkrotowski Date: Mon Jun 4 22:29:19 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- enable multi-job builds
- enable PGO builds (useful only without system xulrunner, requires
working X server on :100)
---- Files affected:
packages/iceweasel:
iceweasel.spec (1.179 -> 1.180)
---- Diffs:
================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.179
packages/iceweasel/iceweasel.spec:1.180
--- packages/iceweasel/iceweasel.spec:1.179 Tue May 29 15:03:25 2012
+++ packages/iceweasel/iceweasel.spec Tue Jun 5 00:29:13 2012
@@ -1,4 +1,6 @@
# $Revision$, $Date$
+# TODO:
+# - provide proper $DISPLAY for PGO (Xvfb, Xdummy...) for unattended builds
#
# Conditional build:
%bcond_with tests # enable tests (whatever they check)
@@ -8,8 +10,9 @@
%if "%{pld_release}" == "ti"
%bcond_with xulrunner # build with system xulrunner
%else
-%bcond_without xulrunner # build with system xulrunner
+%bcond_without xulrunner # build without system xulrunner
%endif
+%bcond_with pgo # PGO-enabled build (requires working $DISPLAY
== :100)
%if %{without gnome}
%undefine with_gnomeui
@@ -82,6 +85,7 @@
BuildRequires: pkgconfig
BuildRequires: pkgconfig(libffi) >= 3.0.9
BuildRequires: python-modules
+%{?with_pgo:BuildRequires: python-modules-sqlite}
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.601
BuildRequires: sqlite3-devel >= 3.7.10
@@ -181,6 +185,10 @@
# is supposed to be exact copy
cp -a config/rules.mk js/src/config/rules.mk
+%if %{with pgo}
+sed -i -e 's@__BROWSER_PATH__@"../../dist/bin/iceweasel-bin"@'
build/automation.py.in
+%endif
+
%build
cd mozilla
cp -f %{_datadir}/automake/config.* build/autoconf
@@ -189,6 +197,8 @@
. \$topsrcdir/browser/config/mozconfig
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu}
+mk_add_options MOZ_MAKE_FLAGS=%{_smp_mflags}
+mk_add_options PROFILE_GEN_SCRIPT='@PYTHON@
@MOZ_OBJDIR@/_profile/pgo/profileserver.py'
# Options for 'configure' (same as command-line options).
ac_add_options --prefix=%{_prefix}
@@ -260,10 +270,19 @@
ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
EOF
+%if %{with pgo}
+export DISPLAY=:100
+%{__make} -f client.mk profiledbuild \
+ DESTDIR=obj-%{_target_cpu}/dist \
+ STRIP="/bin/true" \
+ CC="%{__cc}" \
+ CXX="%{__cxx}"
+%else
%{__make} -f client.mk build \
STRIP="/bin/true" \
CC="%{__cc}" \
CXX="%{__cxx}"
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -556,6 +575,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.180 2012/06/04 22:29:13 lkrotowski
+- enable multi-job builds
+- enable PGO builds (useful only without system xulrunner, requires
+ working X server on :100)
+
Revision 1.179 2012/05/29 13:03:25 qboosh
- updated files and _noautoreq for builds with included xulrunner
- when building with system xulrunner, normally depend on xulrunner libs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/iceweasel/iceweasel.spec?r1=1.179&r2=1.180
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
