/[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.17
1# Copyright 1999-2002 Gentoo Technologies, Inc. 1# Copyright 1999-2004 Gentoo Foundation
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# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.17 2004/08/22 17:48:59 swegener Exp $
4#
3# Author: Martin Schlemmer <azarah@gentoo.org> 5# 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 $ 6#
5# This eclass can be used for packages that needs a working X environment to build 7# This eclass can be used for packages that needs a working X environment to build
8
6ECLASS=virtualx 9ECLASS=virtualx
7newdepend virtual/x11 10INHERITED="$INHERITED $ECLASS"
11DEPEND="virtual/x11"
8 12
9DESCRIPTION="Based on the $ECLASS eclass" 13DESCRIPTION="Based on the $ECLASS eclass"
10 14
15[ -z "${SANDBOX_DISABLED}" ] && export SANDBOX_DISABLED="0" || :
16
11virtualmake() { 17virtualmake() {
12 local retval=0 18 local retval=0
19 local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}"
13 20
14 #If $DISPLAY is not set, or xhost cannot connect to an X 21 #If $DISPLAY is not set, or xhost cannot connect to an X
15 #display, then do the Xvfb hack. 22 #display, then do the Xvfb hack.
16 if [ -z "$DISPLAY" ] || ! (/usr/X11R6/bin/xhost &>/dev/null) 23 if [ -z "$DISPLAY" ] || ! (/usr/X11R6/bin/xhost &>/dev/null)
17 then 24 then
18 export XAUTHORITY= 25 export XAUTHORITY=
19 # The following is derived from Mandrake's hack to allow 26 # The following is derived from Mandrake's hack to allow
20 # compiling without the X display 27 # compiling without the X display
21 28
22 echo ">>> Scanning for a open DISPLAY to start Xvfb..." 29 einfo "Scanning for a open DISPLAY to start Xvfb..."
30
31 # We really do not want SANDBOX enabled here
32 export SANDBOX_DISABLED="1"
23 33
24 local i=0 34 local i=0
25 XDISPLAY=$(i=0; while [ -f /tmp/.X${i}-lock ] ; do i=$((${i}+1));done; echo ${i}) 35 XDISPLAY=$(i=0; while [ -f /tmp/.X${i}-lock ] ; do i=$((${i}+1));done; echo ${i})
26 36
27 # If we are in a chrooted environment, and there is already a 37 # If we are in a chrooted environment, and there is already a
29 # on the same display (most cases this is :0 ), so make sure 39 # on the same display (most cases this is :0 ), so make sure
30 # Xvfb is started, else bump the display number 40 # Xvfb is started, else bump the display number
31 # 41 #
32 # Azarah - 5 May 2002 42 # Azarah - 5 May 2002
33 # 43 #
44 # Changed the mode from 800x600x32 to 800x600x24 because the mfb
45 # support has been dropped in Xvfb in the xorg-x11 pre-releases.
46 # For now only depths up to 24-bit are supported.
47 #
48 # Sven Wegener <swegener@gentoo.org> - 22 Aug 2004
49 #
34 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 50 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24 &>/dev/null &
35 sleep 2 51 sleep 2
36 52
53 local start=${XDISPLAY}
37 while [ ! -f /tmp/.X${XDISPLAY}-lock ] 54 while [ ! -f /tmp/.X${XDISPLAY}-lock ]
38 do 55 do
56 # Stop trying after 15 tries
57 if [ $((${XDISPLAY} - ${start})) -gt 15 ]; then
58
59 eerror ""
60 eerror "Unable to start Xvfb."
61 eerror ""
62 eerror "'/usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24' returns:"
63 eerror ""
64 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24
65 eerror ""
66 eerror "If possible, correct the above error and try your emerge again."
67 eerror ""
68 die
69 fi
70
39 XDISPLAY=$((${XDISPLAY}+1)) 71 XDISPLAY=$((${XDISPLAY}+1))
40 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 72 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24 &>/dev/null &
41 sleep 2 73 sleep 2
42 done 74 done
43 75
76 # Now enable SANDBOX again if needed.
77 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}"
78
44 echo ">>> Starting Xvfb on \$DISPLAY=${XDISPLAY} ..." 79 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
45 80
46 export DISPLAY=:${XDISPLAY} 81 export DISPLAY=:${XDISPLAY}
47 #Do not break on error, but setup $retval, as we need 82 #Do not break on error, but setup $retval, as we need
48 #to kill Xvfb 83 #to kill Xvfb
49 ${maketype} $* 84 ${maketype} $*
54 else 89 else
55 #Normal make if we can connect to an X display 90 #Normal make if we can connect to an X display
56 ${maketype} $* 91 ${maketype} $*
57 retval=$? 92 retval=$?
58 fi 93 fi
94
59 return $retval 95 return $retval
60} 96}
61 97
62#Same as "make", but setup the Xvfb hack if needed 98#Same as "make", but setup the Xvfb hack if needed
63Xmake() { 99Xmake() {
69Xemake() { 105Xemake() {
70 export maketype="emake" 106 export maketype="emake"
71 virtualmake "$*" 107 virtualmake "$*"
72} 108}
73 109
110#Same as "econf", but setup the Xvfb hack if needed
111Xeconf() {
112 export maketype="econf"
113 virtualmake "$*"
114}

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

  ViewVC Help
Powered by ViewVC 1.1.20