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

Diff of /eclass/virtualx.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20