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

Diff of /eclass/virtualx.eclass

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

Revision 1.7 Revision 1.14
1# Copyright 1999-2002 Gentoo Technologies, Inc. 1# Copyright 1999-2003 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# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.14 2003/06/21 02:29:45 jje 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.7 2002/07/12 15:24:36 danarmak 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
7INHERITED="$INHERITED $ECLASS" 10INHERITED="$INHERITED $ECLASS"
8newdepend virtual/x11 11newdepend virtual/x11
9 12
10DESCRIPTION="Based on the $ECLASS eclass" 13DESCRIPTION="Based on the $ECLASS eclass"
11 14
15[ -z "${SANDBOX_DISABLED}" ] && export SANDBOX_DISABLED="0" || :
16
12virtualmake() { 17virtualmake() {
13 local retval=0 18 local retval=0
19 local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}"
14 20
15 #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
16 #display, then do the Xvfb hack. 22 #display, then do the Xvfb hack.
17 if [ -z "$DISPLAY" ] || ! (/usr/X11R6/bin/xhost &>/dev/null) 23 if [ -z "$DISPLAY" ] || ! (/usr/X11R6/bin/xhost &>/dev/null)
18 then 24 then
19 export XAUTHORITY= 25 export XAUTHORITY=
20 # The following is derived from Mandrake's hack to allow 26 # The following is derived from Mandrake's hack to allow
21 # compiling without the X display 27 # compiling without the X display
22 28
23 einfo "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"
24 33
25 local i=0 34 local i=0
26 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})
27 36
28 # 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
33 # Azarah - 5 May 2002 42 # Azarah - 5 May 2002
34 # 43 #
35 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 44 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null &
36 sleep 2 45 sleep 2
37 46
47 local start=${XDISPLAY}
38 while [ ! -f /tmp/.X${XDISPLAY}-lock ] 48 while [ ! -f /tmp/.X${XDISPLAY}-lock ]
39 do 49 do
50 # Stop trying after 15 tries
51 if [ $((${XDISPLAY} - ${start})) -gt 15 ]; then
52
53 eerror ""
54 eerror "Unable to start Xvfb."
55 eerror ""
56 eerror "'/usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32' returns:"
57 eerror ""
58 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32
59 eerror ""
60 eerror "If possible, correct the above error and try your emerge again."
61 eerror ""
62 die
63 fi
64
40 XDISPLAY=$((${XDISPLAY}+1)) 65 XDISPLAY=$((${XDISPLAY}+1))
41 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 66 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null &
42 sleep 2 67 sleep 2
43 done 68 done
69
70 # Now enable SANDBOX again if needed.
71 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}"
44 72
45 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..." 73 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
46 74
47 export DISPLAY=:${XDISPLAY} 75 export DISPLAY=:${XDISPLAY}
48 #Do not break on error, but setup $retval, as we need 76 #Do not break on error, but setup $retval, as we need
55 else 83 else
56 #Normal make if we can connect to an X display 84 #Normal make if we can connect to an X display
57 ${maketype} $* 85 ${maketype} $*
58 retval=$? 86 retval=$?
59 fi 87 fi
88
60 return $retval 89 return $retval
61} 90}
62 91
63#Same as "make", but setup the Xvfb hack if needed 92#Same as "make", but setup the Xvfb hack if needed
64Xmake() { 93Xmake() {
70Xemake() { 99Xemake() {
71 export maketype="emake" 100 export maketype="emake"
72 virtualmake "$*" 101 virtualmake "$*"
73} 102}
74 103
104#Same as "econf", but setup the Xvfb hack if needed
105Xeconf() {
106 export maketype="econf"
107 virtualmake "$*"
108}

Legend:
Removed from v.1.7  
changed lines
  Added in v.1.14

  ViewVC Help
Powered by ViewVC 1.1.20