[packages/iceweasel/DEVEL] - provide DISPLAY for pgo build

baggins baggins at pld-linux.org
Sat Nov 29 15:58:47 CET 2014


commit 7fdc610a26ce37496ee2be66a46b3ba1e52ae836
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Nov 29 15:58:28 2014 +0100

    - provide DISPLAY for pgo build

 iceweasel.spec | 3 +++
 1 file changed, 3 insertions(+)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index 4e5ec0a..328a9a1 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -104,6 +104,7 @@ BuildRequires:	xorg-lib-libXScrnSaver-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXt-devel
+%{?with_pgo:BuildRequires:	xorg-xserver-Xvfb}
 BuildRequires:	zip
 BuildRequires:	zlib-devel >= 1.2.3
 BuildConflicts:	%{name}-devel < %{version}-%{release}
@@ -314,12 +315,14 @@ ac_add_options --with-x
 EOF
 
 %if %{with pgo}
+/usr/bin/Xvfb :100 & && XFVB_PID=$! || exit 1
 export DISPLAY=:100
 %{__make} -j1 -f client.mk profiledbuild \
 	DESTDIR=obj-%{_target_cpu}/dist \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
 	MOZ_MAKE_FLAGS="%{_smp_mflags}"
+kill $XFVB_PID
 %else
 %{__make} -j1 -f client.mk build \
 	CC="%{__cc}" \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/7fdc610a26ce37496ee2be66a46b3ba1e52ae836



More information about the pld-cvs-commit mailing list