/[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.35
1# Copyright 1999-2002 Gentoo Technologies, Inc. 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# 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 $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.35 2010/05/15 05:40:46 dirtyepic Exp $
5# This eclass can be used for packages that needs a working X environment to build
6 4
7ECLASS=virtualx 5# Original author: Martin Schlemmer <azarah@gentoo.org>
8INHERITED="$INHERITED $ECLASS"
9newdepend virtual/x11
10 6
11DESCRIPTION="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.
12 11
13[ -z "${SANDBOX_DISABLED}" ] && export SANDBOX_DISABLED="0" || : 12# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
13# @DESCRIPTION:
14# Is a dependency on xorg-server and xhost needed?
15# Valid values are "always", "optional", and "manual".
16# "tests" is a synonym for "optional".
17: ${VIRTUALX_REQUIRED:=optional}
18
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
14 53
15virtualmake() { 54virtualmake() {
16 local retval=0 55 local retval=0
17 local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}" 56 local OLD_SANDBOX_ON="${SANDBOX_ON}"
57 local XVFB=$(type -p Xvfb)
58 local XHOST=$(type -p xhost)
18 59
19 #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
20 #display, then do the Xvfb hack. 61 # display, then do the Xvfb hack.
21 if [ -z "$DISPLAY" ] || ! (/usr/X11R6/bin/xhost &>/dev/null) 62 if [[ -n ${XVFB} && -n ${XHOST} ]] && \
22 then 63 ( [[ -z ${DISPLAY} ]] || ! (${XHOST} &>/dev/null) ) ; then
23 export XAUTHORITY= 64 export XAUTHORITY=
24 # The following is derived from Mandrake's hack to allow 65 # The following is derived from Mandrake's hack to allow
25 # compiling without the X display 66 # compiling without the X display
26 67
27 einfo "Scanning for a open DISPLAY to start Xvfb..." 68 einfo "Scanning for an open DISPLAY to start Xvfb ..."
28 69
29 # We really do not want SANDBOX enabled here 70 # We really do not want SANDBOX enabled here
30 export SANDBOX_DISABLED="1" 71 export SANDBOX_ON="0"
31 72
32 local i=0 73 local i=0
33 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})
34 75
35 # 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
36 # 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
37 # 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
38 # Xvfb is started, else bump the display number 79 # Xvfb is started, else bump the display number
39 # 80 #
40 # Azarah - 5 May 2002 81 # Azarah - 5 May 2002
41 # 82 #
42 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 83 # Changed the mode from 800x600x32 to 800x600x24 because the mfb
84 # support has been dropped in Xvfb in the xorg-x11 pre-releases.
85 # For now only depths up to 24-bit are supported.
86 #
87 # Sven Wegener <swegener@gentoo.org> - 22 Aug 2004
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)
94 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
43 sleep 2 95 sleep 2
44 96
97 local start=${XDISPLAY}
45 while [ ! -f /tmp/.X${XDISPLAY}-lock ] 98 while [[ ! -f /tmp/.X${XDISPLAY}-lock ]] ; do
46 do 99 # Stop trying after 15 tries
47 XDISPLAY=$((${XDISPLAY}+1)) 100 if ((XDISPLAY - start > 15)) ; then
48 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 101
102 eerror ""
103 eerror "Unable to start Xvfb."
104 eerror ""
105 eerror "'${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24' returns:"
106 eerror ""
107 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24
108 eerror ""
109 eerror "If possible, correct the above error and try your emerge again."
110 eerror ""
111 die
112 fi
113
114 ((XDISPLAY++))
115 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
49 sleep 2 116 sleep 2
50 done 117 done
51 118
52 # Now enable SANDBOX again if needed. 119 # Now enable SANDBOX again if needed.
53 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}" 120 export SANDBOX_ON="${OLD_SANDBOX_ON}"
54 121
55 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..." 122 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
56 123
57 export DISPLAY=:${XDISPLAY} 124 export DISPLAY=:${XDISPLAY}
58 #Do not break on error, but setup $retval, as we need 125 #Do not break on error, but setup $retval, as we need
59 #to kill Xvfb 126 #to kill Xvfb
60 ${maketype} $* 127 ${maketype} "$@"
61 retval=$? 128 retval=$?
62 129
63 #Now kill Xvfb 130 #Now kill Xvfb
64 kill $(cat /tmp/.X${XDISPLAY}-lock) 131 kill $(cat /tmp/.X${XDISPLAY}-lock)
65 else 132 else
66 #Normal make if we can connect to an X display 133 #Normal make if we can connect to an X display
67 ${maketype} $* 134 ${maketype} "$@"
68 retval=$? 135 retval=$?
69 fi 136 fi
70 137
71 return $retval 138 return ${retval}
72} 139}
73 140
141# @FUNCTION: Xmake
142# @DESCRIPTION:
74#Same as "make", but setup the Xvfb hack if needed 143# Same as "make", but set up the Xvfb hack if needed.
75Xmake() { 144Xmake() {
76 export maketype="make" 145 export maketype="make"
77 virtualmake "$*" 146 virtualmake "$@"
78} 147}
79 148
149# @FUNCTION: Xemake
150# @DESCRIPTION:
80#Same as "emake", but setup the Xvfb hack if needed 151# Same as "emake", but set up the Xvfb hack if needed.
81Xemake() { 152Xemake() {
82 export maketype="emake" 153 export maketype="emake"
83 virtualmake "$*" 154 virtualmake "$@"
84} 155}
85 156
157# @FUNCTION: Xeconf
158# @DESCRIPTION:
159# Same as "econf", but set up the Xvfb hack if needed.
160Xeconf() {
161 export maketype="econf"
162 virtualmake "$@"
163}

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

  ViewVC Help
Powered by ViewVC 1.1.20