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

Diff of /eclass/virtualx.eclass

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

Revision 1.9 Revision 1.20
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 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.20 2005/06/07 14:26:03 azarah 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.9 2002/10/25 19:55:52 vapier 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
6 8
7ECLASS=virtualx 9ECLASS=virtualx
8INHERITED="$INHERITED $ECLASS" 10INHERITED="$INHERITED $ECLASS"
9newdepend virtual/x11 11DEPEND="X? ( virtual/x11 )"
10 12
11DESCRIPTION="Based on the $ECLASS eclass" 13DESCRIPTION="Based on the $ECLASS eclass"
12 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
13[ -z "${SANDBOX_DISABLED}" ] && export SANDBOX_DISABLED="0" || : 21 [[ -z ${SANDBOX_DISABLED} ]] && export SANDBOX_DISABLED="0" || :
22fi
14 23
15virtualmake() { 24virtualmake() {
16 local retval=0 25 local retval=0
17 local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}" 26 local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}"
27 local XVFB=$(type -p Xvfb)
28 local XHOST=$(type -p xhost)
18 29
19 #If $DISPLAY is not set, or xhost cannot connect to an X 30 # If $DISPLAY is not set, or xhost cannot connect to an X
20 #display, then do the Xvfb hack. 31 # display, then do the Xvfb hack.
21 if [ -z "$DISPLAY" ] || ! (/usr/X11R6/bin/xhost &>/dev/null) 32 if [[ -n ${XVFB} && -n ${XHOST} ]] && \
22 then 33 ( [[ -z ${DISPLAY} ]] || ! (${XHOST} &>/dev/null) ) ; then
23 export XAUTHORITY= 34 export XAUTHORITY=
24 # The following is derived from Mandrake's hack to allow 35 # The following is derived from Mandrake's hack to allow
25 # compiling without the X display 36 # compiling without the X display
26 37
27 einfo "Scanning for a open DISPLAY to start Xvfb..." 38 einfo "Scanning for a open DISPLAY to start Xvfb ..."
28 39
29 # We really do not want SANDBOX enabled here 40 # We really do not want SANDBOX enabled here
30 export SANDBOX_DISABLED="1" 41 export SANDBOX_DISABLED="1"
31 42
32 local i=0 43 local i=0
33 XDISPLAY=$(i=0; while [ -f /tmp/.X${i}-lock ] ; do i=$((${i}+1));done; echo ${i}) 44 XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do i=$((${i}+1));done; echo ${i})
34 45
35 # If we are in a chrooted environment, and there is already a 46 # If we are in a chrooted environment, and there is already a
36 # X server started outside of the chroot, Xvfb will fail to start 47 # X server started outside of the chroot, Xvfb will fail to start
37 # on the same display (most cases this is :0 ), so make sure 48 # on the same display (most cases this is :0 ), so make sure
38 # Xvfb is started, else bump the display number 49 # Xvfb is started, else bump the display number
39 # 50 #
40 # Azarah - 5 May 2002 51 # Azarah - 5 May 2002
41 # 52 #
53 # Changed the mode from 800x600x32 to 800x600x24 because the mfb
54 # support has been dropped in Xvfb in the xorg-x11 pre-releases.
55 # For now only depths up to 24-bit are supported.
56 #
57 # Sven Wegener <swegener@gentoo.org> - 22 Aug 2004
58 #
42 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 59 ${XVFB} :${XDISPLAY} -screen 0 800x600x24 &>/dev/null &
43 sleep 2 60 sleep 2
44 61
62 local start=${XDISPLAY}
45 while [ ! -f /tmp/.X${XDISPLAY}-lock ] 63 while [[ ! -f /tmp/.X${XDISPLAY}-lock ]] ; do
46 do 64 # Stop trying after 15 tries
65 if [[ $((${XDISPLAY} - ${start})) -gt 15 ]] ; then
66
67 eerror ""
68 eerror "Unable to start Xvfb."
69 eerror ""
70 eerror "'/usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24' returns:"
71 eerror ""
72 ${XVFB} :${XDISPLAY} -screen 0 800x600x24
73 eerror ""
74 eerror "If possible, correct the above error and try your emerge again."
75 eerror ""
76 die
77 fi
78
47 XDISPLAY=$((${XDISPLAY}+1)) 79 XDISPLAY=$((${XDISPLAY}+1))
48 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 80 ${XVFB} :${XDISPLAY} -screen 0 800x600x24 &>/dev/null &
49 sleep 2 81 sleep 2
50 done 82 done
51 83
52 # Now enable SANDBOX again if needed. 84 # Now enable SANDBOX again if needed.
53 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}" 85 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}"
66 #Normal make if we can connect to an X display 98 #Normal make if we can connect to an X display
67 ${maketype} $* 99 ${maketype} $*
68 retval=$? 100 retval=$?
69 fi 101 fi
70 102
71 return $retval 103 return ${retval}
72} 104}
73 105
74#Same as "make", but setup the Xvfb hack if needed 106#Same as "make", but setup the Xvfb hack if needed
75Xmake() { 107Xmake() {
76 export maketype="make" 108 export maketype="make"
81Xemake() { 113Xemake() {
82 export maketype="emake" 114 export maketype="emake"
83 virtualmake "$*" 115 virtualmake "$*"
84} 116}
85 117
118#Same as "econf", but setup the Xvfb hack if needed
119Xeconf() {
120 export maketype="econf"
121 virtualmake "$*"
122}

Legend:
Removed from v.1.9  
changed lines
  Added in v.1.20

  ViewVC Help
Powered by ViewVC 1.1.20