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

Diff of /eclass/virtualx.eclass

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

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

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.30

  ViewVC Help
Powered by ViewVC 1.1.20