summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/mesa-demos
diff options
context:
space:
mode:
authorDrew Moseley <drew_moseley@mentor.com>2014-11-26 19:49:55 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-05 18:01:06 +0000
commit0935937969e6189e897973bb32c36b7672faa6b4 (patch)
tree00c7ecc1a72e56e65148fa431009fb7e065a65ca /meta/recipes-graphics/mesa/mesa-demos
parentab4ed9c72c3d2e9409e1da8553fdc94bdcc5999e (diff)
downloadpoky-0935937969e6189e897973bb32c36b7672faa6b4.tar.gz
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 <drew_moseley@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa-demos')
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch10
1 files 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
95index 1647d64..754c47c 100644 95index 1647d64..754c47c 100644
96--- a/src/Makefile.am 96--- a/src/Makefile.am
97+++ b/src/Makefile.am 97+++ b/src/Makefile.am
98@@ -23,14 +23,13 @@ 98@@ -23,14 +23,18 @@
99 # Eric Anholt <eric@anholt.net> 99 # Eric Anholt <eric@anholt.net>
100 100
101+if HAVE_GLEW
102+UTIL = util
103+endif
104+
101 SUBDIRS = \ 105 SUBDIRS = \
102- util \ 106- util \
107+ $(UTIL) \
103 data \ 108 data \
104 demos \ 109 demos \
105 egl \ 110 egl \
@@ -111,7 +116,7 @@ index 1647d64..754c47c 100644
111 objviewer \ 116 objviewer \
112 osdemos \ 117 osdemos \
113 perf \ 118 perf \
114@@ -40,8 +39,13 @@ SUBDIRS = \ 119@@ -40,8 +39,12 @@ SUBDIRS = \
115 slang \ 120 slang \
116 tests \ 121 tests \
117 tools \ 122 tools \
@@ -125,7 +130,6 @@ index 1647d64..754c47c 100644
125+SUBDIRS += \ 130+SUBDIRS += \
126+ vp \ 131+ vp \
127+ vpglsl \ 132+ vpglsl \
128+ util \
129+ trivial 133+ trivial
130+endif 134+endif
131diff --git a/src/demos/Makefile.am b/src/demos/Makefile.am 135diff --git a/src/demos/Makefile.am b/src/demos/Makefile.am