/[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.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.7 2002/07/12 15:24:36 danarmak 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" 7INHERITED="$INHERITED $ECLASS"
8newdepend virtual/x11 8newdepend virtual/x11
9 9
10DESCRIPTION="Based on the $ECLASS eclass" 10DESCRIPTION="Based on the $ECLASS eclass"
11 11
12[ -z "${SANDBOX_DISABLED}" ] && export SANDBOX_DISABLED="0" || :
13
12virtualmake() { 14virtualmake() {
13 local retval=0 15 local retval=0
16 local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}"
14 17
15 #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
16 #display, then do the Xvfb hack. 19 #display, then do the Xvfb hack.
17 if [ -z "$DISPLAY" ] || ! (/usr/X11R6/bin/xhost &>/dev/null) 20 if [ -z "$DISPLAY" ] || ! (/usr/X11R6/bin/xhost &>/dev/null)
18 then 21 then
19 export XAUTHORITY= 22 export XAUTHORITY=
20 # The following is derived from Mandrake's hack to allow 23 # The following is derived from Mandrake's hack to allow
21 # compiling without the X display 24 # compiling without the X display
22 25
23 einfo "Scanning for a open DISPLAY to start Xvfb..." 26 einfo "Scanning for a open DISPLAY to start Xvfb..."
27
28 # We really do not want SANDBOX enabled here
29 export SANDBOX_DISABLED="1"
24 30
25 local i=0 31 local i=0
26 XDISPLAY=$(i=0; 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})
27 33
28 # If we are in a chrooted environment, and there is already a 34 # If we are in a chrooted environment, and there is already a
40 XDISPLAY=$((${XDISPLAY}+1)) 46 XDISPLAY=$((${XDISPLAY}+1))
41 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 47 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null &
42 sleep 2 48 sleep 2
43 done 49 done
44 50
51 # Now enable SANDBOX again if needed.
52 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}"
53
45 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..." 54 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
46 55
47 export DISPLAY=:${XDISPLAY} 56 export DISPLAY=:${XDISPLAY}
48 #Do not break on error, but setup $retval, as we need 57 #Do not break on error, but setup $retval, as we need
49 #to kill Xvfb 58 #to kill Xvfb
55 else 64 else
56 #Normal make if we can connect to an X display 65 #Normal make if we can connect to an X display
57 ${maketype} $* 66 ${maketype} $*
58 retval=$? 67 retval=$?
59 fi 68 fi
69
60 return $retval 70 return $retval
61} 71}
62 72
63#Same as "make", but setup the Xvfb hack if needed 73#Same as "make", but setup the Xvfb hack if needed
64Xmake() { 74Xmake() {

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

  ViewVC Help
Powered by ViewVC 1.1.20