| 1 | # Copyright 1999-2002 Gentoo Technologies, Inc. |
1 | # Copyright 1999-2002 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 or later |
| 3 | # Author: Martin Schlemmer <azarah@gentoo.org> |
3 | # Author: Martin Schlemmer <azarah@gentoo.org> |
| 4 | # $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.1 2002/04/09 06:17:29 azarah Exp $ |
4 | # $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.5 2002/05/05 17:12:35 azarah Exp $ |
| 5 | # This eclass can be used for packages that needs a working X environment to build |
5 | # This eclass can be used for packages that needs a working X environment to build |
| 6 | ECLASS=virtualx |
6 | ECLASS=virtualx |
| 7 | newdepend virtual/x11 |
7 | newdepend virtual/x11 |
| 8 | |
8 | |
| 9 | DESCRIPTION="Based on the $ECLASS eclass" |
9 | DESCRIPTION="Based on the $ECLASS eclass" |
| 10 | |
10 | |
| 11 | virtualmake() { |
11 | virtualmake() { |
| 12 | local retval=0 |
12 | local retval=0 |
| 13 | local Xconnect="/usr/X11R6/bin/xhost" |
|
|
| 14 | |
13 | |
| 15 | #If $DISPLAY is not set, or xhost cannot connect to an X |
14 | #If $DISPLAY is not set, or xhost cannot connect to an X |
| 16 | #display, then do the Xvfb hack. |
15 | #display, then do the Xvfb hack. |
| 17 | if [ -z "$DISPLAY" ] || ! /usr/X11R6/bin/xhost |
16 | if [ -z "$DISPLAY" ] || ! (/usr/X11R6/bin/xhost &>/dev/null) |
| 18 | then |
17 | then |
| 19 | # Mandrake's hack to allow compiling without the X display |
18 | export XAUTHORITY= |
|
|
19 | # The following is derived from Mandrake's hack to allow |
|
|
20 | # compiling without the X display |
|
|
21 | |
|
|
22 | echo ">>> Scanning for a open DISPLAY to start Xvfb..." |
|
|
23 | |
| 20 | local i=0 |
24 | local i=0 |
| 21 | XDISPLAY=$(i=0; while [ -f /tmp/.X${i}-lock ] ; do i=$((${i}+1));done; echo ${i}) |
25 | XDISPLAY=$(i=0; while [ -f /tmp/.X${i}-lock ] ; do i=$((${i}+1));done; echo ${i}) |
|
|
26 | |
|
|
27 | # If we are in a chrooted environment, and there is already a |
|
|
28 | # X server started outside of the chroot, Xvfb will fail to start |
|
|
29 | # on the same display (most cases this is :0 ), so make sure |
|
|
30 | # Xvfb is started, else bump the display number |
|
|
31 | # |
|
|
32 | # Azarah - 5 May 2002 |
|
|
33 | # |
| 22 | /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & |
34 | /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & |
|
|
35 | sleep 2 |
|
|
36 | |
|
|
37 | while [ ! -f /tmp/.X${XDISPLAY}-lock ] |
|
|
38 | do |
|
|
39 | XDISPLAY=$((${XDISPLAY}+1)) |
|
|
40 | /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null & |
|
|
41 | sleep 2 |
|
|
42 | done |
|
|
43 | |
|
|
44 | echo ">>> Starting Xvfb on \$DISPLAY=${XDISPLAY} ..." |
| 23 | |
45 | |
| 24 | export DISPLAY=:${XDISPLAY} |
46 | export DISPLAY=:${XDISPLAY} |
| 25 | #Do not break on error, but setup $retval, as we need |
47 | #Do not break on error, but setup $retval, as we need |
| 26 | #to kill Xvfb |
48 | #to kill Xvfb |
| 27 | ${maketype} $* |
49 | ${maketype} $* |
| … | |
… | |
| 36 | fi |
58 | fi |
| 37 | return $retval |
59 | return $retval |
| 38 | } |
60 | } |
| 39 | |
61 | |
| 40 | #Same as "make", but setup the Xvfb hack if needed |
62 | #Same as "make", but setup the Xvfb hack if needed |
| 41 | xmake() { |
63 | Xmake() { |
| 42 | export maketype="make" |
64 | export maketype="make" |
| 43 | virtualmake "$*" |
65 | virtualmake "$*" |
| 44 | } |
66 | } |
| 45 | |
67 | |
| 46 | #Same as "emake", but setup the Xvfb hack if needed |
68 | #Same as "emake", but setup the Xvfb hack if needed |
| 47 | xemake() { |
69 | Xemake() { |
| 48 | export maketype="emake" |
70 | export maketype="emake" |
| 49 | virtualmake "$*" |
71 | virtualmake "$*" |
| 50 | } |
72 | } |
| 51 | |
73 | |
Parent Directory
| 
Revision Log
| 
Patch