From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- ...-packages-to-be-used-by-the-enabled-flavo.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch (limited to 'meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch') diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch new file mode 100644 index 000000000..72b8debe5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch @@ -0,0 +1,43 @@ +From: Otavio Salvador +Subject: [PATCH] build: Check packages to be used by the enabled flavors +Organization: O.S. Systems Software LTDA. + +The packages shouldn't be dynamically detected otherwise the build +predictability is lost. We now have all packages as mandatory but +dependent of the flavors which use them. + +Upstream-Status: Submitted [https://github.com/glmark2/glmark2/pull/8] + +Signed-off-by: Otavio Salvador +--- + wscript | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/wscript b/wscript +index cab62a3..e7eaed0 100644 +--- a/wscript ++++ b/wscript +@@ -121,13 +121,17 @@ def configure(ctx): + ('mirclient','mirclient', '0.13', list_contains(ctx.options.flavors, 'mir')), + ('wayland-client','wayland-client', None, list_contains(ctx.options.flavors, 'wayland')), + ('wayland-egl','wayland-egl', None, list_contains(ctx.options.flavors, 'wayland'))] +- for (pkg, uselib, atleast, mandatory) in opt_pkgs: ++ for (pkg, uselib, atleast, check) in opt_pkgs: ++ # Check packages required by the flavors ++ if not check: ++ continue ++ + if atleast is None: + ctx.check_cfg(package = pkg, uselib_store = uselib, +- args = '--cflags --libs', mandatory = mandatory) ++ args = '--cflags --libs', mandatory = True) + else: + ctx.check_cfg(package = pkg, uselib_store = uselib, atleast_version=atleast, +- args = '--cflags --libs', mandatory = mandatory) ++ args = '--cflags --libs', mandatory = True) + + + # Prepend CXX flags so that they can be overriden by the +-- +2.4.6 + -- cgit v1.2.1