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

Diff of /eclass/virtualx.eclass

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

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

Legend:
Removed from v.1.26  
changed lines
  Added in v.1.35

  ViewVC Help
Powered by ViewVC 1.1.20