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

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

  ViewVC Help
Powered by ViewVC 1.1.20