diff mbox

[Branch,~glcompbench-dev/glcompbench/trunk] Rev 53: Check for the correct packages when building egl-gl flavor.

Message ID 20110720153534.9174.67868.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

alexandros.frantzis@linaro.org July 20, 2011, 3:35 p.m. UTC 
------------------------------------------------------------
revno: 53
committer: Alexandros Frantzis <alexandros.frantzis@linaro.org>
branch nick: trunk
timestamp: Wed 2011-07-20 18:33:07 +0300
message:
  Check for the correct packages when building egl-gl flavor.
modified:
  wscript


--
lp:glcompbench
https://code.launchpad.net/~glcompbench-dev/glcompbench/trunk

You are subscribed to branch lp:glcompbench.
To unsubscribe from this branch go to https://code.launchpad.net/~glcompbench-dev/glcompbench/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'wscript'
--- wscript	2011-07-18 15:00:13 +0000
+++ wscript	2011-07-20 15:33:07 +0000
@@ -69,9 +69,9 @@ 
                 mandatory = True)
 
     # Check conditional packages
-    req_pkgs = [('egl', 'egl', ctx.env.BUILD_EGL_ES2),
+    req_pkgs = [('egl', 'egl', ctx.env.BUILD_EGL_ES2 or ctx.env.BUILD_EGL_GL),
                 ('glesv2', 'glesv2', ctx.env.BUILD_EGL_ES2),
-                ('gl', 'gl', ctx.env.BUILD_GLX)]
+                ('gl', 'gl', ctx.env.BUILD_GLX or ctx.env.BUILD_EGL_GL)]
     for (pkg, uselib, check_for) in req_pkgs:
         if check_for:
             ctx.check_cfg(package = pkg, uselib_store = uselib, args = '--cflags --libs',