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

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

  ViewVC Help
Powered by ViewVC 1.1.20