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

Diff of /eclass/virtualx.eclass

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

Revision 1.22 Revision 1.33
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2009 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.22 2005/07/06 20:20:04 agriffis Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.33 2009/12/21 17:27:28 abcd 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
9DEPEND="X? ( virtual/x11 )" 9# Is a dependency on xorg-server and xhost needed?
10IUSE="X" 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="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
11 44
12DESCRIPTION="Based on the $ECLASS eclass" 45DESCRIPTION="Based on the $ECLASS eclass"
13 46
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" || :
21fi
22
23virtualmake() { 47virtualmake() {
24 local retval=0 48 local retval=0
25 local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}" 49 local OLD_SANDBOX_ON="${SANDBOX_ON}"
26 local XVFB=$(type -p Xvfb) 50 local XVFB=$(type -p Xvfb)
27 local XHOST=$(type -p xhost) 51 local XHOST=$(type -p xhost)
28 52
29 # 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
30 # display, then do the Xvfb hack. 54 # display, then do the Xvfb hack.
32 ( [[ -z ${DISPLAY} ]] || ! (${XHOST} &>/dev/null) ) ; then 56 ( [[ -z ${DISPLAY} ]] || ! (${XHOST} &>/dev/null) ) ; then
33 export XAUTHORITY= 57 export XAUTHORITY=
34 # The following is derived from Mandrake's hack to allow 58 # The following is derived from Mandrake's hack to allow
35 # compiling without the X display 59 # compiling without the X display
36 60
37 einfo "Scanning for a open DISPLAY to start Xvfb ..." 61 einfo "Scanning for an open DISPLAY to start Xvfb ..."
38 62
39 # We really do not want SANDBOX enabled here 63 # We really do not want SANDBOX enabled here
40 export SANDBOX_DISABLED="1" 64 export SANDBOX_ON="0"
41 65
42 local i=0 66 local i=0
43 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})
44 68
45 # 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
46 # 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
47 # 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
48 # Xvfb is started, else bump the display number 72 # Xvfb is started, else bump the display number
49 # 73 #
53 # support has been dropped in Xvfb in the xorg-x11 pre-releases. 77 # support has been dropped in Xvfb in the xorg-x11 pre-releases.
54 # For now only depths up to 24-bit are supported. 78 # For now only depths up to 24-bit are supported.
55 # 79 #
56 # Sven Wegener <swegener@gentoo.org> - 22 Aug 2004 80 # Sven Wegener <swegener@gentoo.org> - 22 Aug 2004
57 # 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)
58 ${XVFB} :${XDISPLAY} -screen 0 800x600x24 &>/dev/null & 87 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
59 sleep 2 88 sleep 2
60 89
61 local start=${XDISPLAY} 90 local start=${XDISPLAY}
62 while [[ ! -f /tmp/.X${XDISPLAY}-lock ]] ; do 91 while [[ ! -f /tmp/.X${XDISPLAY}-lock ]] ; do
63 # Stop trying after 15 tries 92 # Stop trying after 15 tries
64 if [[ $((${XDISPLAY} - ${start})) -gt 15 ]] ; then 93 if ((XDISPLAY - start > 15)) ; then
65 94
66 eerror "" 95 eerror ""
67 eerror "Unable to start Xvfb." 96 eerror "Unable to start Xvfb."
68 eerror "" 97 eerror ""
69 eerror "'/usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24' returns:" 98 eerror "'${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24' returns:"
70 eerror "" 99 eerror ""
71 ${XVFB} :${XDISPLAY} -screen 0 800x600x24 100 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24
72 eerror "" 101 eerror ""
73 eerror "If possible, correct the above error and try your emerge again." 102 eerror "If possible, correct the above error and try your emerge again."
74 eerror "" 103 eerror ""
75 die 104 die
76 fi 105 fi
77 106
78 XDISPLAY=$((${XDISPLAY}+1)) 107 ((XDISPLAY++))
79 ${XVFB} :${XDISPLAY} -screen 0 800x600x24 &>/dev/null & 108 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
80 sleep 2 109 sleep 2
81 done 110 done
82 111
83 # Now enable SANDBOX again if needed. 112 # Now enable SANDBOX again if needed.
84 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}" 113 export SANDBOX_ON="${OLD_SANDBOX_ON}"
85 114
86 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..." 115 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
87 116
88 export DISPLAY=:${XDISPLAY} 117 export DISPLAY=:${XDISPLAY}
89 #Do not break on error, but setup $retval, as we need 118 #Do not break on error, but setup $retval, as we need
90 #to kill Xvfb 119 #to kill Xvfb
91 ${maketype} $* 120 ${maketype} "$@"
92 retval=$? 121 retval=$?
93 122
94 #Now kill Xvfb 123 #Now kill Xvfb
95 kill $(cat /tmp/.X${XDISPLAY}-lock) 124 kill $(cat /tmp/.X${XDISPLAY}-lock)
96 else 125 else
97 #Normal make if we can connect to an X display 126 #Normal make if we can connect to an X display
98 ${maketype} $* 127 ${maketype} "$@"
99 retval=$? 128 retval=$?
100 fi 129 fi
101 130
102 return ${retval} 131 return ${retval}
103} 132}
104 133
105#Same as "make", but setup the Xvfb hack if needed 134#Same as "make", but setup the Xvfb hack if needed
106Xmake() { 135Xmake() {
107 export maketype="make" 136 export maketype="make"
108 virtualmake "$*" 137 virtualmake "$@"
109} 138}
110 139
111#Same as "emake", but setup the Xvfb hack if needed 140#Same as "emake", but setup the Xvfb hack if needed
112Xemake() { 141Xemake() {
113 export maketype="emake" 142 export maketype="emake"
114 virtualmake "$*" 143 virtualmake "$@"
115} 144}
116 145
117#Same as "econf", but setup the Xvfb hack if needed 146#Same as "econf", but setup the Xvfb hack if needed
118Xeconf() { 147Xeconf() {
119 export maketype="econf" 148 export maketype="econf"
120 virtualmake "$*" 149 virtualmake "$@"
121} 150}

Legend:
Removed from v.1.22  
changed lines
  Added in v.1.33

  ViewVC Help
Powered by ViewVC 1.1.20