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

Diff of /eclass/virtualx.eclass

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

Revision 1.5 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.5 2002/05/05 17:12:35 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 &>/dev/null) 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 echo ">>> Scanning for a open DISPLAY to start Xvfb..." 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"
23 31
24 local i=0 32 local i=0
25 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})
26 34
27 # If we are in a chrooted environment, and there is already a 35 # If we are in a chrooted environment, and there is already a
32 # Azarah - 5 May 2002 40 # Azarah - 5 May 2002
33 # 41 #
34 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 42 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null &
35 sleep 2 43 sleep 2
36 44
45 local start=${XDISPLAY}
37 while [ ! -f /tmp/.X${XDISPLAY}-lock ] 46 while [ ! -f /tmp/.X${XDISPLAY}-lock ]
38 do 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
39 XDISPLAY=$((${XDISPLAY}+1)) 63 XDISPLAY=$((${XDISPLAY}+1))
40 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 64 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null &
41 sleep 2 65 sleep 2
42 done 66 done
43 67
68 # Now enable SANDBOX again if needed.
69 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}"
70
44 echo ">>> Starting Xvfb on \$DISPLAY=${XDISPLAY} ..." 71 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
45 72
46 export DISPLAY=:${XDISPLAY} 73 export DISPLAY=:${XDISPLAY}
47 #Do not break on error, but setup $retval, as we need 74 #Do not break on error, but setup $retval, as we need
48 #to kill Xvfb 75 #to kill Xvfb
49 ${maketype} $* 76 ${maketype} $*
54 else 81 else
55 #Normal make if we can connect to an X display 82 #Normal make if we can connect to an X display
56 ${maketype} $* 83 ${maketype} $*
57 retval=$? 84 retval=$?
58 fi 85 fi
86
59 return $retval 87 return $retval
60} 88}
61 89
62#Same as "make", but setup the Xvfb hack if needed 90#Same as "make", but setup the Xvfb hack if needed
63Xmake() { 91Xmake() {

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

  ViewVC Help
Powered by ViewVC 1.1.20