blob: 72b8debe564e5eb497fab398777866c5cc503c61 [file] [log] [blame]
Patrick Williamsb48b7b42016-08-17 15:04:38 -05001From: Otavio Salvador <otavio@ossystems.com.br>
2Subject: [PATCH] build: Check packages to be used by the enabled flavors
3Organization: O.S. Systems Software LTDA.
4
5The packages shouldn't be dynamically detected otherwise the build
6predictability is lost. We now have all packages as mandatory but
7dependent of the flavors which use them.
8
9Upstream-Status: Submitted [https://github.com/glmark2/glmark2/pull/8]
10
11Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
12---
13 wscript | 10 +++++++---
14 1 file changed, 7 insertions(+), 3 deletions(-)
15
16diff --git a/wscript b/wscript
17index cab62a3..e7eaed0 100644
18--- a/wscript
19+++ b/wscript
20@@ -121,13 +121,17 @@ def configure(ctx):
Brad Bishop6e60e8b2018-02-01 10:27:11 -050021 ('mirclient','mirclient', '0.13', list_contains(ctx.options.flavors, 'mir')),
22 ('wayland-client','wayland-client', None, list_contains(ctx.options.flavors, 'wayland')),
23 ('wayland-egl','wayland-egl', None, list_contains(ctx.options.flavors, 'wayland'))]
Patrick Williamsb48b7b42016-08-17 15:04:38 -050024- for (pkg, uselib, atleast, mandatory) in opt_pkgs:
25+ for (pkg, uselib, atleast, check) in opt_pkgs:
26+ # Check packages required by the flavors
27+ if not check:
28+ continue
29+
30 if atleast is None:
31 ctx.check_cfg(package = pkg, uselib_store = uselib,
32- args = '--cflags --libs', mandatory = mandatory)
33+ args = '--cflags --libs', mandatory = True)
34 else:
35 ctx.check_cfg(package = pkg, uselib_store = uselib, atleast_version=atleast,
36- args = '--cflags --libs', mandatory = mandatory)
37+ args = '--cflags --libs', mandatory = True)
38
39
40 # Prepend CXX flags so that they can be overriden by the
41--
422.4.6
43