[oe-commits] Drew Moseley : mesa-demos: Move util to the front of the SUBDIRS variable.

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 9e4b25893cc8e15e390b8f25545416ef431f0b88
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9e4b25893cc8e15e390b8f25545416ef431f0b88

Author: Drew Moseley <drew_moseley at mentor.com>
Date:   Wed Nov 26 19:49:55 2014 -0500

mesa-demos: Move util to the front of the SUBDIRS variable.

This forces it to be built first since many of the demos
require it.  Resolves build failures such as the following
when certain demos are enabled (notably when PACKAGECONFIG
contains glut):

    make[2]: *** No rule to make target `../util/libutil.la', needed by `copypix'.  Stop.

Signed-off-by: Drew Moseley <drew_moseley at mentor.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 ...-configure-Allow-to-disable-demos-which-require-GLEW-.patch | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch b/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch
index e02f1ab..4b07193 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch
+++ b/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch
@@ -95,11 +95,16 @@ diff --git a/src/Makefile.am b/src/Makefile.am
 index 1647d64..754c47c 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -23,14 +23,13 @@
+@@ -23,14 +23,18 @@
  #    Eric Anholt <eric at anholt.net>
  
++if HAVE_GLEW
++UTIL = util
++endif
++
  SUBDIRS = \
 -	util \
++	$(UTIL) \
  	data \
  	demos \
  	egl \
@@ -111,7 +116,7 @@ index 1647d64..754c47c 100644
  	objviewer \
  	osdemos \
  	perf \
-@@ -40,8 +39,13 @@ SUBDIRS = \
+@@ -40,8 +39,12 @@ SUBDIRS = \
  	slang \
  	tests \
  	tools \
@@ -125,7 +130,6 @@ index 1647d64..754c47c 100644
 +SUBDIRS += \
 +	vp \
 +	vpglsl \
-+	util \
 +	trivial
 +endif
 diff --git a/src/demos/Makefile.am b/src/demos/Makefile.am