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

Diff of /eclass/virtualx.eclass

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

Revision 1.13 Revision 1.29
1# Copyright 1999-2003 Gentoo Technologies, Inc. 1# Copyright 1999-2004 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.13 2003/02/28 09:15:04 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.29 2009/08/10 15:44:37 remi Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# 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 8
9ECLASS=virtualx 9DEPEND="X? ( x11-base/xorg-server x11-apps/xhost )"
10INHERITED="$INHERITED $ECLASS" 10IUSE="X"
11newdepend virtual/x11
12 11
13DESCRIPTION="Based on the $ECLASS eclass" 12DESCRIPTION="Based on the $ECLASS eclass"
14 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
15[ -z "${SANDBOX_DISABLED}" ] && export SANDBOX_DISABLED="0" || : 20 [[ -z ${SANDBOX_DISABLED} ]] && export SANDBOX_DISABLED="0" || :
21fi
16 22
17virtualmake() { 23virtualmake() {
18 local retval=0 24 local retval=0
19 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)
20 28
21 #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
22 #display, then do the Xvfb hack. 30 # display, then do the Xvfb hack.
23 if [ -z "$DISPLAY" ] || ! (/usr/X11R6/bin/xhost &>/dev/null) 31 if [[ -n ${XVFB} && -n ${XHOST} ]] && \
24 then 32 ( [[ -z ${DISPLAY} ]] || ! (${XHOST} &>/dev/null) ) ; then
25 export XAUTHORITY= 33 export XAUTHORITY=
26 # The following is derived from Mandrake's hack to allow 34 # The following is derived from Mandrake's hack to allow
27 # compiling without the X display 35 # compiling without the X display
28 36
29 einfo "Scanning for a open DISPLAY to start Xvfb..." 37 einfo "Scanning for an open DISPLAY to start Xvfb ..."
30 38
31 # We really do not want SANDBOX enabled here 39 # We really do not want SANDBOX enabled here
32 export SANDBOX_DISABLED="1" 40 export SANDBOX_DISABLED="1"
33 41
34 local i=0 42 local i=0
35 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})
36 44
37 # 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
38 # 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
39 # 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
40 # Xvfb is started, else bump the display number 48 # Xvfb is started, else bump the display number
41 # 49 #
42 # Azarah - 5 May 2002 50 # Azarah - 5 May 2002
43 # 51 #
44 /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 &
45 sleep 2 64 sleep 2
46 65
47 local start=${XDISPLAY} 66 local start=${XDISPLAY}
48 while [ ! -f /tmp/.X${XDISPLAY}-lock ] 67 while [[ ! -f /tmp/.X${XDISPLAY}-lock ]] ; do
49 do
50 # Stop trying after 15 tries 68 # Stop trying after 15 tries
51 if [ $((${XDISPLAY} - ${start})) -gt 15 ]; then 69 if [[ $((${XDISPLAY} - ${start})) -gt 15 ]] ; then
52 70
53 eerror "" 71 eerror ""
54 eerror "Unable to start Xvfb." 72 eerror "Unable to start Xvfb."
55 eerror "" 73 eerror ""
56 eerror "'/usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32' returns:" 74 eerror "'/usr/bin/Xvfb :${XDISPLAY} -fp built-ins -screen 0 800x600x24' returns:"
57 eerror "" 75 eerror ""
58 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 76 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24
59 eerror "" 77 eerror ""
60 eerror "If possible, correct the above error and try your emerge again." 78 eerror "If possible, correct the above error and try your emerge again."
61 eerror "" 79 eerror ""
62 die 80 die
63 fi 81 fi
64 82
65 XDISPLAY=$((${XDISPLAY}+1)) 83 XDISPLAY=$((${XDISPLAY}+1))
66 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 84 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
67 sleep 2 85 sleep 2
68 done 86 done
69 87
70 # Now enable SANDBOX again if needed. 88 # Now enable SANDBOX again if needed.
71 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}" 89 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}"
72 90
73 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..." 91 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
74 92
75 export DISPLAY=:${XDISPLAY} 93 export DISPLAY=:${XDISPLAY}
76 #Do not break on error, but setup $retval, as we need 94 #Do not break on error, but setup $retval, as we need
77 #to kill Xvfb 95 #to kill Xvfb
78 ${maketype} $* 96 ${maketype} $*
79 retval=$? 97 retval=$?
84 #Normal make if we can connect to an X display 102 #Normal make if we can connect to an X display
85 ${maketype} $* 103 ${maketype} $*
86 retval=$? 104 retval=$?
87 fi 105 fi
88 106
89 return $retval 107 return ${retval}
90} 108}
91 109
92#Same as "make", but setup the Xvfb hack if needed 110#Same as "make", but setup the Xvfb hack if needed
93Xmake() { 111Xmake() {
94 export maketype="make" 112 export maketype="make"
99Xemake() { 117Xemake() {
100 export maketype="emake" 118 export maketype="emake"
101 virtualmake "$*" 119 virtualmake "$*"
102} 120}
103 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.13  
changed lines
  Added in v.1.29

  ViewVC Help
Powered by ViewVC 1.1.20