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

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

  ViewVC Help
Powered by ViewVC 1.1.20