diff options
author | Ross Burton <ross.burton@intel.com> | 2012-07-30 17:17:28 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-19 10:45:57 +0100 |
commit | 7477153dd81bcf6c9afed47e73b388c755df30b4 (patch) | |
tree | 335e85fb5806d3340a3057c524801f0a0e94eee4 /meta/recipes-graphics/mesa/mesa | |
parent | 25db6dd7fc3175aa1f2e5acc148674c9f506777e (diff) | |
download | poky-7477153dd81bcf6c9afed47e73b388c755df30b4.tar.gz |
mesa: respect x11 DISTRO_FEATURE
Patch originally by Damien Lespiau <damien.lespiau@intel.com>.
(From OE-Core rev: d3e60b835c5abcf2345e761027aa520409c19efc)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch b/meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch new file mode 100644 index 0000000000..cf9dee25ee --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | gross hack to prevent from install libgl | ||
2 | |||
3 | This patch is not suitable for upstream. This is only needed for the 8.0.x | ||
4 | branch, master (8.1.x) has a largely different build system (using automake) | ||
5 | and does not need it. It is fully expected to drop the patch with the next bump | ||
6 | to a stable version based on 8.1.x. | ||
7 | |||
8 | Upstream-Status: Inappropriate | ||
9 | |||
10 | --- | ||
11 | src/mesa/Makefile | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/src/mesa/Makefile b/src/mesa/Makefile | ||
15 | index 0e15d61..a0a2cb5 100644 | ||
16 | --- a/src/mesa/Makefile | ||
17 | +++ b/src/mesa/Makefile | ||
18 | @@ -166,7 +166,7 @@ install: default $(DRICORE_INSTALL_TARGET) | ||
19 | else \ | ||
20 | $(MAKE) install-osmesa || exit 1 ; \ | ||
21 | fi ;; \ | ||
22 | - dri) $(MAKE) install-libgl install-dri || exit 1 ;; \ | ||
23 | + dri) $(MAKE) install-dri || exit 1 ;; \ | ||
24 | *) $(MAKE) install-libgl || exit 1 ;; \ | ||
25 | esac ; \ | ||
26 | done | ||
27 | -- | ||
28 | 1.7.10.4 | ||
29 | |||