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

Diff of /eclass/virtualx.eclass

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

Revision 1.8 Revision 1.19
1# Copyright 1999-2002 Gentoo Technologies, Inc. 1# Copyright 1999-2004 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License, v2 or later 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.19 2004/11/04 10:53:14 ferringb 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.8 2002/09/11 17:22:02 azarah 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
8
6ECLASS=virtualx 9ECLASS=virtualx
7INHERITED="$INHERITED $ECLASS" 10INHERITED="$INHERITED $ECLASS"
8newdepend virtual/x11 11DEPEND="virtual/x11"
9 12
10DESCRIPTION="Based on the $ECLASS eclass" 13DESCRIPTION="Based on the $ECLASS eclass"
11 14
15#
16# Brian Harring <ferringb@gentoo.org> 11/04/2004
17# do not disable the sandbox during the depend phase.
18# ebuilds shouldn't touch the fs during depend phase, nor screw with the sandbox.
19#
20if [ "${EBUILD_PHASE/depend}" == "${EBUILD_PHASE}" ]; then
12[ -z "${SANDBOX_DISABLED}" ] && export SANDBOX_DISABLED="0" || : 21 [ -z "${SANDBOX_DISABLED}" ] && export SANDBOX_DISABLED="0" || :
22fi
13 23
14virtualmake() { 24virtualmake() {
15 local retval=0 25 local retval=0
16 local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}" 26 local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}"
17 27
21 then 31 then
22 export XAUTHORITY= 32 export XAUTHORITY=
23 # The following is derived from Mandrake's hack to allow 33 # The following is derived from Mandrake's hack to allow
24 # compiling without the X display 34 # compiling without the X display
25 35
26 einfo "Scanning for a open DISPLAY to start Xvfb..." 36 einfo "Scanning for a open DISPLAY to start Xvfb ..."
27 37
28 # We really do not want SANDBOX enabled here 38 # We really do not want SANDBOX enabled here
29 export SANDBOX_DISABLED="1" 39 export SANDBOX_DISABLED="1"
30 40
31 local i=0 41 local i=0
36 # on the same display (most cases this is :0 ), so make sure 46 # on the same display (most cases this is :0 ), so make sure
37 # Xvfb is started, else bump the display number 47 # Xvfb is started, else bump the display number
38 # 48 #
39 # Azarah - 5 May 2002 49 # Azarah - 5 May 2002
40 # 50 #
51 # Changed the mode from 800x600x32 to 800x600x24 because the mfb
52 # support has been dropped in Xvfb in the xorg-x11 pre-releases.
53 # For now only depths up to 24-bit are supported.
54 #
55 # Sven Wegener <swegener@gentoo.org> - 22 Aug 2004
56 #
41 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 57 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24 &>/dev/null &
42 sleep 2 58 sleep 2
43 59
60 local start=${XDISPLAY}
44 while [ ! -f /tmp/.X${XDISPLAY}-lock ] 61 while [ ! -f /tmp/.X${XDISPLAY}-lock ]
45 do 62 do
63 # Stop trying after 15 tries
64 if [ $((${XDISPLAY} - ${start})) -gt 15 ]; then
65
66 eerror ""
67 eerror "Unable to start Xvfb."
68 eerror ""
69 eerror "'/usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24' returns:"
70 eerror ""
71 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24
72 eerror ""
73 eerror "If possible, correct the above error and try your emerge again."
74 eerror ""
75 die
76 fi
77
46 XDISPLAY=$((${XDISPLAY}+1)) 78 XDISPLAY=$((${XDISPLAY}+1))
47 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & 79 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24 &>/dev/null &
48 sleep 2 80 sleep 2
49 done 81 done
50 82
51 # Now enable SANDBOX again if needed. 83 # Now enable SANDBOX again if needed.
52 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}" 84 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}"
80Xemake() { 112Xemake() {
81 export maketype="emake" 113 export maketype="emake"
82 virtualmake "$*" 114 virtualmake "$*"
83} 115}
84 116
117#Same as "econf", but setup the Xvfb hack if needed
118Xeconf() {
119 export maketype="econf"
120 virtualmake "$*"
121}

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.19

  ViewVC Help
Powered by ViewVC 1.1.20