/[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.34
1# Copyright 1999-2002 Gentoo Technologies, Inc. 1# Copyright 1999-2010 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.34 2010/03/04 21:18:27 abcd 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" 9# Is a dependency on xorg-server and xhost needed?
8newdepend virtual/x11 10# Valid values are "always", "optional", and "manual"
11# "tests" is treated as a synonym for "optional"
12: ${VIRTUALX_REQUIRED:=optional}
13
14# If VIRTUALX_REQUIRED=optional, what use flag should control
15# the dependency? Default is "test"
16: ${VIRTUALX_USE:=test}
17
18# Dep string available for use outside of eclass, in case a more
19# complicated dep is needed
20VIRTUALX_DEPEND="!prefix? ( x11-base/xorg-server )
21 x11-apps/xhost"
22
23case ${VIRTUALX_REQUIRED} in
24 always)
25 DEPEND="${VIRTUALX_DEPEND}"
26 RDEPEND=""
27 ;;
28 optional|tests)
29 DEPEND="${VIRTUALX_USE}? ( ${VIRTUALX_DEPEND} )"
30 RDEPEND=""
31 IUSE="${VIRTUALX_USE}"
32 ;;
33 manual)
34 ;;
35 *)
36 eerror "Invalid value (${VIRTUALX_REQUIRED}) for VIRTUALX_REQUIRED"
37 eerror "Valid values are:"
38 eerror " always"
39 eerror " optional (default if unset)"
40 eerror " manual"
41 die "Invalid value (${VIRTUALX_REQUIRED}) for VIRTUALX_REQUIRED"
42 ;;
43esac
9 44
10DESCRIPTION="Based on the $ECLASS eclass" 45DESCRIPTION="Based on the $ECLASS eclass"
11 46
12[ -z "${SANDBOX_DISABLED}" ] && export SANDBOX_DISABLED="0" || :
13
14virtualmake() { 47virtualmake() {
15 local retval=0 48 local retval=0
16 local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}" 49 local OLD_SANDBOX_ON="${SANDBOX_ON}"
50 local XVFB=$(type -p Xvfb)
51 local XHOST=$(type -p xhost)
17 52
18 #If $DISPLAY is not set, or xhost cannot connect to an X 53 # If $DISPLAY is not set, or xhost cannot connect to an X
19 #display, then do the Xvfb hack. 54 # display, then do the Xvfb hack.
20 if [ -z "$DISPLAY" ] || ! (/usr/X11R6/bin/xhost &>/dev/null) 55 if [[ -n ${XVFB} && -n ${XHOST} ]] && \
21 then 56 ( [[ -z ${DISPLAY} ]] || ! (${XHOST} &>/dev/null) ) ; then
22 export XAUTHORITY= 57 export XAUTHORITY=
23 # The following is derived from Mandrake's hack to allow 58 # The following is derived from Mandrake's hack to allow
24 # compiling without the X display 59 # compiling without the X display
25 60
26 einfo "Scanning for a open DISPLAY to start Xvfb..." 61 einfo "Scanning for an open DISPLAY to start Xvfb ..."
27 62
28 # We really do not want SANDBOX enabled here 63 # We really do not want SANDBOX enabled here
29 export SANDBOX_DISABLED="1" 64 export SANDBOX_ON="0"
30 65
31 local i=0 66 local i=0
32 XDISPLAY=$(i=0; while [ -f /tmp/.X${i}-lock ] ; do i=$((${i}+1));done; echo ${i}) 67 XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do ((i++));done; echo ${i})
33 68
34 # If we are in a chrooted environment, and there is already a 69 # 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 70 # 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 71 # on the same display (most cases this is :0 ), so make sure
37 # Xvfb is started, else bump the display number 72 # Xvfb is started, else bump the display number
38 # 73 #
39 # Azarah - 5 May 2002 74 # Azarah - 5 May 2002
40 # 75 #
41 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 76 # Changed the mode from 800x600x32 to 800x600x24 because the mfb
77 # support has been dropped in Xvfb in the xorg-x11 pre-releases.
78 # For now only depths up to 24-bit are supported.
79 #
80 # Sven Wegener <swegener@gentoo.org> - 22 Aug 2004
81 #
82 # Use "-fp built-ins" because it's only part of the default font path
83 # for Xorg but not the other DDXs (Xvfb, Kdrive, etc). Temporarily fixes
84 # bug 278487 until xorg-server is properly patched
85 #
86 # RĂ©mi Cardona <remi@gentoo.org> (10 Aug 2009)
87 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
42 sleep 2 88 sleep 2
43 89
90 local start=${XDISPLAY}
44 while [ ! -f /tmp/.X${XDISPLAY}-lock ] 91 while [[ ! -f /tmp/.X${XDISPLAY}-lock ]] ; do
45 do 92 # Stop trying after 15 tries
46 XDISPLAY=$((${XDISPLAY}+1)) 93 if ((XDISPLAY - start > 15)) ; then
47 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 94
95 eerror ""
96 eerror "Unable to start Xvfb."
97 eerror ""
98 eerror "'${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24' returns:"
99 eerror ""
100 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24
101 eerror ""
102 eerror "If possible, correct the above error and try your emerge again."
103 eerror ""
104 die
105 fi
106
107 ((XDISPLAY++))
108 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
48 sleep 2 109 sleep 2
49 done 110 done
50 111
51 # Now enable SANDBOX again if needed. 112 # Now enable SANDBOX again if needed.
52 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}" 113 export SANDBOX_ON="${OLD_SANDBOX_ON}"
53 114
54 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..." 115 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
55 116
56 export DISPLAY=:${XDISPLAY} 117 export DISPLAY=:${XDISPLAY}
57 #Do not break on error, but setup $retval, as we need 118 #Do not break on error, but setup $retval, as we need
58 #to kill Xvfb 119 #to kill Xvfb
59 ${maketype} $* 120 ${maketype} "$@"
60 retval=$? 121 retval=$?
61 122
62 #Now kill Xvfb 123 #Now kill Xvfb
63 kill $(cat /tmp/.X${XDISPLAY}-lock) 124 kill $(cat /tmp/.X${XDISPLAY}-lock)
64 else 125 else
65 #Normal make if we can connect to an X display 126 #Normal make if we can connect to an X display
66 ${maketype} $* 127 ${maketype} "$@"
67 retval=$? 128 retval=$?
68 fi 129 fi
69 130
70 return $retval 131 return ${retval}
71} 132}
72 133
73#Same as "make", but setup the Xvfb hack if needed 134#Same as "make", but setup the Xvfb hack if needed
74Xmake() { 135Xmake() {
75 export maketype="make" 136 export maketype="make"
76 virtualmake "$*" 137 virtualmake "$@"
77} 138}
78 139
79#Same as "emake", but setup the Xvfb hack if needed 140#Same as "emake", but setup the Xvfb hack if needed
80Xemake() { 141Xemake() {
81 export maketype="emake" 142 export maketype="emake"
82 virtualmake "$*" 143 virtualmake "$@"
83} 144}
84 145
146#Same as "econf", but setup the Xvfb hack if needed
147Xeconf() {
148 export maketype="econf"
149 virtualmake "$@"
150}

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

  ViewVC Help
Powered by ViewVC 1.1.20