Patchwork [CONSOLIDATED,PULL,10/32] scripts/runqemu: modify search paths for libgl

login
register
mail settings
Submitter Saul Wold
Date Aug. 18, 2011, 8:55 p.m.
Message ID <e00ee2e411bebc7a0f581534dfa68f16fc28e34c.1313700595.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/10223/
State New, archived
Headers show

Comments

Saul Wold - Aug. 18, 2011, 8:55 p.m.
From: Anders Darander <anders@chargestorm.se>

On e.g. Debian libql is found under /usr/lib/x86_64-linux-gnu/libGL.so.
Use a wildcard to match different locations, as uname -i only return unknown on Debian.

Signed-off-by: Anders Darander <anders@chargestorm.se>
---
 scripts/runqemu |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/scripts/runqemu b/scripts/runqemu
index 2b8e88a..ed8c05b 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -388,7 +388,7 @@  libgl='no'
 
 test -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so && libgl='yes'
 test -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so && libgl='yes'
-test -e /usr/lib/`uname -i`-linux-gnu/libGL.so -a -e /usr/lib/`uname -i`-linux-gnu/libGLU.so && libgl='yes'
+test -e /usr/lib/*-linux-gnu/libGL.so -a -e /usr/lib/*-linux-gnu/libGLU.so && libgl='yes'
 
 if [ "$libgl" != 'yes' ]; then
     echo "You need libGL.so and libGLU.so to exist in your library path to run the QEMU emulator.