/[gentoo-x86]/eclass/virtualx.eclass
Gentoo

Diff of /eclass/virtualx.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.4 Revision 1.7
1# Copyright 1999-2002 Gentoo Technologies, Inc. 1# Copyright 1999-2002 Gentoo Technologies, Inc.
2# Distributed under the terms of the GNU General Public License, v2 or later 2# Distributed under the terms of the GNU General Public License, v2 or later
3# Author: Martin Schlemmer <azarah@gentoo.org> 3# Author: Martin Schlemmer <azarah@gentoo.org>
4# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.4 2002/05/05 16:47:04 azarah Exp $ 4# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.7 2002/07/12 15:24:36 danarmak Exp $
5# This eclass can be used for packages that needs a working X environment to build 5# This eclass can be used for packages that needs a working X environment to build
6ECLASS=virtualx 6ECLASS=virtualx
7INHERITED="$INHERITED $ECLASS"
7newdepend virtual/x11 8newdepend virtual/x11
8 9
9DESCRIPTION="Based on the $ECLASS eclass" 10DESCRIPTION="Based on the $ECLASS eclass"
10 11
11virtualmake() { 12virtualmake() {
12 local retval=0 13 local retval=0
13 14
14 #If $DISPLAY is not set, or xhost cannot connect to an X 15 #If $DISPLAY is not set, or xhost cannot connect to an X
15 #display, then do the Xvfb hack. 16 #display, then do the Xvfb hack.
16 if [ -z "$DISPLAY" ] || ! /usr/X11R6/bin/xhost 17 if [ -z "$DISPLAY" ] || ! (/usr/X11R6/bin/xhost &>/dev/null)
17 then 18 then
18 export XAUTHORITY= 19 export XAUTHORITY=
19 # The following is derived from Mandrake's hack to allow 20 # The following is derived from Mandrake's hack to allow
20 # compiling without the X display 21 # compiling without the X display
21 22
22 # Only start at :1, as the default display is usually :0, 23 einfo "Scanning for a open DISPLAY to start Xvfb..."
23 # and Xvfb cannot start if X is already running. This 24
24 # is mainly to fix chroot issues where this wont detect
25 # a running X, as we dont have /tmp mounted (--bind) in
26 # the chroot. (Azarah - 5 May 2002)
27 local i=1 25 local i=0
28 XDISPLAY=$(i=1; while [ -f /tmp/.X${i}-lock ] ; do i=$((${i}+1));done; echo ${i}) 26 XDISPLAY=$(i=0; while [ -f /tmp/.X${i}-lock ] ; do i=$((${i}+1));done; echo ${i})
27
28 # If we are in a chrooted environment, and there is already a
29 # X server started outside of the chroot, Xvfb will fail to start
30 # on the same display (most cases this is :0 ), so make sure
31 # Xvfb is started, else bump the display number
32 #
33 # Azarah - 5 May 2002
34 #
29 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 35 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null &
36 sleep 2
37
38 while [ ! -f /tmp/.X${XDISPLAY}-lock ]
39 do
40 XDISPLAY=$((${XDISPLAY}+1))
41 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null &
42 sleep 2
43 done
44
45 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
30 46
31 export DISPLAY=:${XDISPLAY} 47 export DISPLAY=:${XDISPLAY}
32 #Do not break on error, but setup $retval, as we need 48 #Do not break on error, but setup $retval, as we need
33 #to kill Xvfb 49 #to kill Xvfb
34 ${maketype} $* 50 ${maketype} $*

Legend:
Removed from v.1.4  
changed lines
  Added in v.1.7

  ViewVC Help
Powered by ViewVC 1.1.20