| 1 | # Copyright 1999-2002 Gentoo Technologies, Inc. |
1 | # Copyright 1999-2003 Gentoo Technologies, Inc. |
| 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.14 2003/06/21 02:29:45 jje 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.4 2002/05/05 16:47:04 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 | |
| 6 | ECLASS=virtualx |
9 | ECLASS=virtualx |
|
|
10 | INHERITED="$INHERITED $ECLASS" |
| 7 | newdepend virtual/x11 |
11 | newdepend virtual/x11 |
| 8 | |
12 | |
| 9 | DESCRIPTION="Based on the $ECLASS eclass" |
13 | DESCRIPTION="Based on the $ECLASS eclass" |
| 10 | |
14 | |
|
|
15 | [ -z "${SANDBOX_DISABLED}" ] && export SANDBOX_DISABLED="0" || : |
|
|
16 | |
| 11 | virtualmake() { |
17 | virtualmake() { |
| 12 | local retval=0 |
18 | local retval=0 |
|
|
19 | local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}" |
| 13 | |
20 | |
| 14 | #If $DISPLAY is not set, or xhost cannot connect to an X |
21 | #If $DISPLAY is not set, or xhost cannot connect to an X |
| 15 | #display, then do the Xvfb hack. |
22 | #display, then do the Xvfb hack. |
| 16 | if [ -z "$DISPLAY" ] || ! /usr/X11R6/bin/xhost |
23 | if [ -z "$DISPLAY" ] || ! (/usr/X11R6/bin/xhost &>/dev/null) |
| 17 | then |
24 | then |
| 18 | export XAUTHORITY= |
25 | export XAUTHORITY= |
| 19 | # The following is derived from Mandrake's hack to allow |
26 | # The following is derived from Mandrake's hack to allow |
| 20 | # compiling without the X display |
27 | # compiling without the X display |
| 21 | |
28 | |
| 22 | # Only start at :1, as the default display is usually :0, |
29 | einfo "Scanning for a open DISPLAY to start Xvfb..." |
| 23 | # and Xvfb cannot start if X is already running. This |
30 | |
| 24 | # is mainly to fix chroot issues where this wont detect |
31 | # We really do not want SANDBOX enabled here |
| 25 | # a running X, as we dont have /tmp mounted (--bind) in |
32 | export SANDBOX_DISABLED="1" |
| 26 | # the chroot. (Azarah - 5 May 2002) |
33 | |
| 27 | local i=1 |
34 | local i=0 |
| 28 | XDISPLAY=$(i=1; while [ -f /tmp/.X${i}-lock ] ; do i=$((${i}+1));done; echo ${i}) |
35 | XDISPLAY=$(i=0; while [ -f /tmp/.X${i}-lock ] ; do i=$((${i}+1));done; echo ${i}) |
|
|
36 | |
|
|
37 | # If we are in a chrooted environment, and there is already a |
|
|
38 | # X server started outside of the chroot, Xvfb will fail to start |
|
|
39 | # on the same display (most cases this is :0 ), so make sure |
|
|
40 | # Xvfb is started, else bump the display number |
|
|
41 | # |
|
|
42 | # Azarah - 5 May 2002 |
|
|
43 | # |
| 29 | /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & |
44 | /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & |
|
|
45 | sleep 2 |
|
|
46 | |
|
|
47 | local start=${XDISPLAY} |
|
|
48 | while [ ! -f /tmp/.X${XDISPLAY}-lock ] |
|
|
49 | do |
|
|
50 | # Stop trying after 15 tries |
|
|
51 | if [ $((${XDISPLAY} - ${start})) -gt 15 ]; then |
|
|
52 | |
|
|
53 | eerror "" |
|
|
54 | eerror "Unable to start Xvfb." |
|
|
55 | eerror "" |
|
|
56 | eerror "'/usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32' returns:" |
|
|
57 | eerror "" |
|
|
58 | /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 |
|
|
59 | eerror "" |
|
|
60 | eerror "If possible, correct the above error and try your emerge again." |
|
|
61 | eerror "" |
|
|
62 | die |
|
|
63 | fi |
|
|
64 | |
|
|
65 | XDISPLAY=$((${XDISPLAY}+1)) |
|
|
66 | /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & |
|
|
67 | sleep 2 |
|
|
68 | done |
|
|
69 | |
|
|
70 | # Now enable SANDBOX again if needed. |
|
|
71 | export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}" |
|
|
72 | |
|
|
73 | einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..." |
| 30 | |
74 | |
| 31 | export DISPLAY=:${XDISPLAY} |
75 | export DISPLAY=:${XDISPLAY} |
| 32 | #Do not break on error, but setup $retval, as we need |
76 | #Do not break on error, but setup $retval, as we need |
| 33 | #to kill Xvfb |
77 | #to kill Xvfb |
| 34 | ${maketype} $* |
78 | ${maketype} $* |
| … | |
… | |
| 39 | else |
83 | else |
| 40 | #Normal make if we can connect to an X display |
84 | #Normal make if we can connect to an X display |
| 41 | ${maketype} $* |
85 | ${maketype} $* |
| 42 | retval=$? |
86 | retval=$? |
| 43 | fi |
87 | fi |
|
|
88 | |
| 44 | return $retval |
89 | return $retval |
| 45 | } |
90 | } |
| 46 | |
91 | |
| 47 | #Same as "make", but setup the Xvfb hack if needed |
92 | #Same as "make", but setup the Xvfb hack if needed |
| 48 | Xmake() { |
93 | Xmake() { |
| … | |
… | |
| 54 | Xemake() { |
99 | Xemake() { |
| 55 | export maketype="emake" |
100 | export maketype="emake" |
| 56 | virtualmake "$*" |
101 | virtualmake "$*" |
| 57 | } |
102 | } |
| 58 | |
103 | |
|
|
104 | #Same as "econf", but setup the Xvfb hack if needed |
|
|
105 | Xeconf() { |
|
|
106 | export maketype="econf" |
|
|
107 | virtualmake "$*" |
|
|
108 | } |
Parent Directory
| 
Revision Log
| 
Patch