/[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.9
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
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.9 2002/10/25 19:55:52 vapier 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
6
6ECLASS=virtualx 7ECLASS=virtualx
8INHERITED="$INHERITED $ECLASS"
7newdepend virtual/x11 9newdepend virtual/x11
8 10
9DESCRIPTION="Based on the $ECLASS eclass" 11DESCRIPTION="Based on the $ECLASS eclass"
10 12
13[ -z "${SANDBOX_DISABLED}" ] && export SANDBOX_DISABLED="0" || :
14
11virtualmake() { 15virtualmake() {
12 local retval=0 16 local retval=0
17 local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}"
13 18
14 #If $DISPLAY is not set, or xhost cannot connect to an X 19 #If $DISPLAY is not set, or xhost cannot connect to an X
15 #display, then do the Xvfb hack. 20 #display, then do the Xvfb hack.
16 if [ -z "$DISPLAY" ] || ! /usr/X11R6/bin/xhost 21 if [ -z "$DISPLAY" ] || ! (/usr/X11R6/bin/xhost &>/dev/null)
17 then 22 then
18 export XAUTHORITY= 23 export XAUTHORITY=
19 # The following is derived from Mandrake's hack to allow 24 # The following is derived from Mandrake's hack to allow
20 # compiling without the X display 25 # compiling without the X display
21 26
22 # Only start at :1, as the default display is usually :0, 27 einfo "Scanning for a open DISPLAY to start Xvfb..."
23 # and Xvfb cannot start if X is already running. This 28
24 # is mainly to fix chroot issues where this wont detect 29 # We really do not want SANDBOX enabled here
25 # a running X, as we dont have /tmp mounted (--bind) in 30 export SANDBOX_DISABLED="1"
26 # the chroot. (Azarah - 5 May 2002) 31
27 local i=1 32 local i=0
28 XDISPLAY=$(i=1; while [ -f /tmp/.X${i}-lock ] ; do i=$((${i}+1));done; echo ${i}) 33 XDISPLAY=$(i=0; while [ -f /tmp/.X${i}-lock ] ; do i=$((${i}+1));done; echo ${i})
34
35 # If we are in a chrooted environment, and there is already a
36 # X server started outside of the chroot, Xvfb will fail to start
37 # on the same display (most cases this is :0 ), so make sure
38 # Xvfb is started, else bump the display number
39 #
40 # Azarah - 5 May 2002
41 #
29 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 42 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null &
43 sleep 2
44
45 while [ ! -f /tmp/.X${XDISPLAY}-lock ]
46 do
47 XDISPLAY=$((${XDISPLAY}+1))
48 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null &
49 sleep 2
50 done
51
52 # Now enable SANDBOX again if needed.
53 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}"
54
55 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
30 56
31 export DISPLAY=:${XDISPLAY} 57 export DISPLAY=:${XDISPLAY}
32 #Do not break on error, but setup $retval, as we need 58 #Do not break on error, but setup $retval, as we need
33 #to kill Xvfb 59 #to kill Xvfb
34 ${maketype} $* 60 ${maketype} $*
39 else 65 else
40 #Normal make if we can connect to an X display 66 #Normal make if we can connect to an X display
41 ${maketype} $* 67 ${maketype} $*
42 retval=$? 68 retval=$?
43 fi 69 fi
70
44 return $retval 71 return $retval
45} 72}
46 73
47#Same as "make", but setup the Xvfb hack if needed 74#Same as "make", but setup the Xvfb hack if needed
48Xmake() { 75Xmake() {

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

  ViewVC Help
Powered by ViewVC 1.1.20