[poky] [PATCH 2/2] qemu: Use mesa's libGL rather than nVidia's to avoid segfault of qemu

[Zhai Edwin]

From: Zhai Edwin <edwin.zhai at intel.com>

Proprietary nVidia driver introduce its own libGL that precede mesa's.
qemu has segfault if linked with it. This fix try to use mesa's libGL
in such case.

[YOCTO #649]
[YOCTO #698]

Signed-off-by: Zhai Edwin <edwin.zhai at intel.com>
---
 scripts/poky-qemu |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/scripts/poky-qemu b/scripts/poky-qemu
index 2d94a11..1d04c37 100755
--- a/scripts/poky-qemu
+++ b/scripts/poky-qemu
@@ -404,6 +404,10 @@ if [ "$nv_libgl" == 'yes' ]; then
     echo "************** !!!Warning!!! **************
     You installed nVidia's libGL.so that probably lead qemu segfault!
     Pls. uninstall proprietary nVidia driver or make mesa libgl precede nvidia's."
+
+    # To avoid segfault of qemu, skip nVidia's libGL and use mesa's instead
+    echo "Skip nVidia's libGL!"
+    export LD_PRELOAD="/usr/lib/libGL.so $LD_PRELOAD"
 fi
 
 INTERNAL_SCRIPT=`which poky-qemu-internal`
-- 
1.7.1