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

Diff of /eclass/virtualx.eclass

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

Revision 1.3 Revision 1.10
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.3 2002/04/15 03:33:50 azarah Exp $ 4# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.10 2003/01/22 01:47:34 jrray 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 # Mandrake's hack to allow compiling without the X display 24 # The following is derived from Mandrake's hack to allow
25 # compiling without the X display
26
27 einfo "Scanning for a open DISPLAY to start Xvfb..."
28
29 # We really do not want SANDBOX enabled here
30 export SANDBOX_DISABLED="1"
31
20 local i=0 32 local i=0
21 XDISPLAY=$(i=0; 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 #
22 /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 local start=${XDISPLAY}
46 while [ ! -f /tmp/.X${XDISPLAY}-lock ]
47 do
48 # Stop trying after 15 tries
49 if [ $((${XDISPLAY} - ${start})) -gt 15 ]; then
50
51 eerror ""
52 eerror "Unable to start Xvfb."
53 eerror ""
54 eerror "'/usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32' returns:"
55 eerror ""
56 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32
57 eerror ""
58 eerror "If possible, correct the above error and try your emerge again."
59 eerror ""
60 die
61 fi
62
63 XDISPLAY=$((${XDISPLAY}+1))
64 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null &
65 sleep 2
66 done
67
68 # Now enable SANDBOX again if needed.
69 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}"
70
71 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
23 72
24 export DISPLAY=:${XDISPLAY} 73 export DISPLAY=:${XDISPLAY}
25 #Do not break on error, but setup $retval, as we need 74 #Do not break on error, but setup $retval, as we need
26 #to kill Xvfb 75 #to kill Xvfb
27 ${maketype} $* 76 ${maketype} $*
32 else 81 else
33 #Normal make if we can connect to an X display 82 #Normal make if we can connect to an X display
34 ${maketype} $* 83 ${maketype} $*
35 retval=$? 84 retval=$?
36 fi 85 fi
86
37 return $retval 87 return $retval
38} 88}
39 89
40#Same as "make", but setup the Xvfb hack if needed 90#Same as "make", but setup the Xvfb hack if needed
41Xmake() { 91Xmake() {

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.10

  ViewVC Help
Powered by ViewVC 1.1.20