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

Diff of /eclass/virtualx.eclass

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

Revision 1.4 Revision 1.19
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.19 2004/11/04 10:53:14 ferringb 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.4 2002/05/05 16:47:04 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#
16# Brian Harring <ferringb@gentoo.org> 11/04/2004
17# do not disable the sandbox during the depend phase.
18# ebuilds shouldn't touch the fs during depend phase, nor screw with the sandbox.
19#
20if [ "${EBUILD_PHASE/depend}" == "${EBUILD_PHASE}" ]; then
21 [ -z "${SANDBOX_DISABLED}" ] && export SANDBOX_DISABLED="0" || :
22fi
23
11virtualmake() { 24virtualmake() {
12 local retval=0 25 local retval=0
26 local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}"
13 27
14 #If $DISPLAY is not set, or xhost cannot connect to an X 28 #If $DISPLAY is not set, or xhost cannot connect to an X
15 #display, then do the Xvfb hack. 29 #display, then do the Xvfb hack.
16 if [ -z "$DISPLAY" ] || ! /usr/X11R6/bin/xhost 30 if [ -z "$DISPLAY" ] || ! (/usr/X11R6/bin/xhost &>/dev/null)
17 then 31 then
18 export XAUTHORITY= 32 export XAUTHORITY=
19 # The following is derived from Mandrake's hack to allow 33 # The following is derived from Mandrake's hack to allow
20 # compiling without the X display 34 # compiling without the X display
21 35
22 # Only start at :1, as the default display is usually :0, 36 einfo "Scanning for a open DISPLAY to start Xvfb ..."
23 # and Xvfb cannot start if X is already running. This 37
24 # is mainly to fix chroot issues where this wont detect 38 # We really do not want SANDBOX enabled here
25 # a running X, as we dont have /tmp mounted (--bind) in 39 export SANDBOX_DISABLED="1"
26 # the chroot. (Azarah - 5 May 2002) 40
27 local i=1 41 local i=0
28 XDISPLAY=$(i=1; while [ -f /tmp/.X${i}-lock ] ; do i=$((${i}+1));done; echo ${i}) 42 XDISPLAY=$(i=0; while [ -f /tmp/.X${i}-lock ] ; do i=$((${i}+1));done; echo ${i})
43
44 # If we are in a chrooted environment, and there is already a
45 # X server started outside of the chroot, Xvfb will fail to start
46 # on the same display (most cases this is :0 ), so make sure
47 # Xvfb is started, else bump the display number
48 #
49 # Azarah - 5 May 2002
50 #
51 # Changed the mode from 800x600x32 to 800x600x24 because the mfb
52 # support has been dropped in Xvfb in the xorg-x11 pre-releases.
53 # For now only depths up to 24-bit are supported.
54 #
55 # Sven Wegener <swegener@gentoo.org> - 22 Aug 2004
56 #
29 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 57 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24 &>/dev/null &
58 sleep 2
59
60 local start=${XDISPLAY}
61 while [ ! -f /tmp/.X${XDISPLAY}-lock ]
62 do
63 # Stop trying after 15 tries
64 if [ $((${XDISPLAY} - ${start})) -gt 15 ]; then
65
66 eerror ""
67 eerror "Unable to start Xvfb."
68 eerror ""
69 eerror "'/usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24' returns:"
70 eerror ""
71 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24
72 eerror ""
73 eerror "If possible, correct the above error and try your emerge again."
74 eerror ""
75 die
76 fi
77
78 XDISPLAY=$((${XDISPLAY}+1))
79 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24 &>/dev/null &
80 sleep 2
81 done
82
83 # Now enable SANDBOX again if needed.
84 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}"
85
86 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
30 87
31 export DISPLAY=:${XDISPLAY} 88 export DISPLAY=:${XDISPLAY}
32 #Do not break on error, but setup $retval, as we need 89 #Do not break on error, but setup $retval, as we need
33 #to kill Xvfb 90 #to kill Xvfb
34 ${maketype} $* 91 ${maketype} $*
39 else 96 else
40 #Normal make if we can connect to an X display 97 #Normal make if we can connect to an X display
41 ${maketype} $* 98 ${maketype} $*
42 retval=$? 99 retval=$?
43 fi 100 fi
101
44 return $retval 102 return $retval
45} 103}
46 104
47#Same as "make", but setup the Xvfb hack if needed 105#Same as "make", but setup the Xvfb hack if needed
48Xmake() { 106Xmake() {
54Xemake() { 112Xemake() {
55 export maketype="emake" 113 export maketype="emake"
56 virtualmake "$*" 114 virtualmake "$*"
57} 115}
58 116
117#Same as "econf", but setup the Xvfb hack if needed
118Xeconf() {
119 export maketype="econf"
120 virtualmake "$*"
121}

Legend:
Removed from v.1.4  
changed lines
  Added in v.1.19

  ViewVC Help
Powered by ViewVC 1.1.20