From 1d2ab458335e3a12129c08dc81fbaf41198bdfa0 Mon Sep 17 00:00:00 2001 From: Drew Moseley Date: Wed, 26 Nov 2014 19:49:55 -0500 Subject: [PATCH] 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. (From OE-Core rev: 9e4b25893cc8e15e390b8f25545416ef431f0b88) Signed-off-by: Drew Moseley Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- ...re-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 e02f1ab4ec..4b07193a7f 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 ++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 -- 2.40.1