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

Diff of /eclass/virtualx.eclass

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

Revision 1.8 Revision 1.29
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.29 2009/08/10 15:44:37 remi 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.8 2002/09/11 17:22:02 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
6ECLASS=virtualx 8
7INHERITED="$INHERITED $ECLASS" 9DEPEND="X? ( x11-base/xorg-server x11-apps/xhost )"
8newdepend virtual/x11 10IUSE="X"
9 11
10DESCRIPTION="Based on the $ECLASS eclass" 12DESCRIPTION="Based on the $ECLASS eclass"
11 13
14#
15# Brian Harring <ferringb@gentoo.org> 11/04/2004
16# do not disable the sandbox during the depend phase.
17# ebuilds shouldn't touch the fs during depend phase, nor screw with the sandbox.
18#
19if [[ ${EBUILD_PHASE/depend} == "${EBUILD_PHASE}" ]] ; then
12[ -z "${SANDBOX_DISABLED}" ] && export SANDBOX_DISABLED="0" || : 20 [[ -z ${SANDBOX_DISABLED} ]] && export SANDBOX_DISABLED="0" || :
21fi
13 22
14virtualmake() { 23virtualmake() {
15 local retval=0 24 local retval=0
16 local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}" 25 local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}"
26 local XVFB=$(type -p Xvfb)
27 local XHOST=$(type -p xhost)
17 28
18 #If $DISPLAY is not set, or xhost cannot connect to an X 29 # If $DISPLAY is not set, or xhost cannot connect to an X
19 #display, then do the Xvfb hack. 30 # display, then do the Xvfb hack.
20 if [ -z "$DISPLAY" ] || ! (/usr/X11R6/bin/xhost &>/dev/null) 31 if [[ -n ${XVFB} && -n ${XHOST} ]] && \
21 then 32 ( [[ -z ${DISPLAY} ]] || ! (${XHOST} &>/dev/null) ) ; then
22 export XAUTHORITY= 33 export XAUTHORITY=
23 # The following is derived from Mandrake's hack to allow 34 # The following is derived from Mandrake's hack to allow
24 # compiling without the X display 35 # compiling without the X display
25 36
26 einfo "Scanning for a open DISPLAY to start Xvfb..." 37 einfo "Scanning for an open DISPLAY to start Xvfb ..."
27 38
28 # We really do not want SANDBOX enabled here 39 # We really do not want SANDBOX enabled here
29 export SANDBOX_DISABLED="1" 40 export SANDBOX_DISABLED="1"
30 41
31 local i=0 42 local i=0
32 XDISPLAY=$(i=0; while [ -f /tmp/.X${i}-lock ] ; do i=$((${i}+1));done; echo ${i}) 43 XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do i=$((${i}+1));done; echo ${i})
33 44
34 # If we are in a chrooted environment, and there is already a 45 # If we are in a chrooted environment, and there is already a
35 # X server started outside of the chroot, Xvfb will fail to start 46 # X server started outside of the chroot, Xvfb will fail to start
36 # on the same display (most cases this is :0 ), so make sure 47 # on the same display (most cases this is :0 ), so make sure
37 # Xvfb is started, else bump the display number 48 # Xvfb is started, else bump the display number
38 # 49 #
39 # Azarah - 5 May 2002 50 # Azarah - 5 May 2002
40 # 51 #
41 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 52 # Changed the mode from 800x600x32 to 800x600x24 because the mfb
53 # support has been dropped in Xvfb in the xorg-x11 pre-releases.
54 # For now only depths up to 24-bit are supported.
55 #
56 # Sven Wegener <swegener@gentoo.org> - 22 Aug 2004
57 #
58 # Use "-fp built-ins" because it's only part of the default font path
59 # for Xorg but not the other DDXs (Xvfb, Kdrive, etc). Temporarily fixes
60 # bug 278487 until xorg-server is properly patched
61 #
62 # RĂ©mi Cardona <remi@gentoo.org> (10 Aug 2009)
63 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
42 sleep 2 64 sleep 2
43 65
66 local start=${XDISPLAY}
44 while [ ! -f /tmp/.X${XDISPLAY}-lock ] 67 while [[ ! -f /tmp/.X${XDISPLAY}-lock ]] ; do
45 do 68 # Stop trying after 15 tries
69 if [[ $((${XDISPLAY} - ${start})) -gt 15 ]] ; then
70
71 eerror ""
72 eerror "Unable to start Xvfb."
73 eerror ""
74 eerror "'/usr/bin/Xvfb :${XDISPLAY} -fp built-ins -screen 0 800x600x24' returns:"
75 eerror ""
76 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24
77 eerror ""
78 eerror "If possible, correct the above error and try your emerge again."
79 eerror ""
80 die
81 fi
82
46 XDISPLAY=$((${XDISPLAY}+1)) 83 XDISPLAY=$((${XDISPLAY}+1))
47 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 84 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
48 sleep 2 85 sleep 2
49 done 86 done
50 87
51 # Now enable SANDBOX again if needed. 88 # Now enable SANDBOX again if needed.
52 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}" 89 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}"
53 90
54 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..." 91 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
55 92
56 export DISPLAY=:${XDISPLAY} 93 export DISPLAY=:${XDISPLAY}
57 #Do not break on error, but setup $retval, as we need 94 #Do not break on error, but setup $retval, as we need
58 #to kill Xvfb 95 #to kill Xvfb
59 ${maketype} $* 96 ${maketype} $*
60 retval=$? 97 retval=$?
65 #Normal make if we can connect to an X display 102 #Normal make if we can connect to an X display
66 ${maketype} $* 103 ${maketype} $*
67 retval=$? 104 retval=$?
68 fi 105 fi
69 106
70 return $retval 107 return ${retval}
71} 108}
72 109
73#Same as "make", but setup the Xvfb hack if needed 110#Same as "make", but setup the Xvfb hack if needed
74Xmake() { 111Xmake() {
75 export maketype="make" 112 export maketype="make"
80Xemake() { 117Xemake() {
81 export maketype="emake" 118 export maketype="emake"
82 virtualmake "$*" 119 virtualmake "$*"
83} 120}
84 121
122#Same as "econf", but setup the Xvfb hack if needed
123Xeconf() {
124 export maketype="econf"
125 virtualmake "$*"
126}

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

  ViewVC Help
Powered by ViewVC 1.1.20