diff options
author | Ross Burton <ross.burton@intel.com> | 2018-09-20 20:19:05 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-21 18:45:47 -0700 |
commit | 4cd0d52e5f99a86c570ce68652f1cc61461303c8 (patch) | |
tree | a28d639c59969310ba72aba7b9cedf1ecc65cb3b /meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch | |
parent | 9d2cbf041403f5012b251de6c2dc0683755398ed (diff) | |
download | poky-4cd0d52e5f99a86c570ce68652f1cc61461303c8.tar.gz |
xserver-xorg: rewrite xorg-server.m4 patch
Instead of having a patch that upstream won't accept, rewrite it in a
upstreamable way and <gasp> submit it upstream.
The fundamental problem is that pkg-config --variable=sdkdir will return the
value of sdkdir literally, whereas --cflags will return -I${sdkdir} *but* will
do sysroot relocation magic on the path so it is usable.
(From OE-Core rev: 4af34cb1193fe86b862566becfb560b3d19155f4)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch new file mode 100644 index 0000000000..2ef9fa9fe4 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/22] | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From 5f65a6246fe752764045dd1e38912f1dccec71e4 Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Thu, 20 Sep 2018 20:12:24 +0100 | ||
7 | Subject: [PATCH] xorg-server.m4: just all cflags instead of just sdkdir | ||
8 | |||
9 | Instead of fetching just the sdkdir variable of xorg-server using pkg-config, | ||
10 | simply get all of the CFLAGS. Aside from completeness, this helps builds in | ||
11 | sysroots as pkg-config knows what to do with --cflags but doesn't remap | ||
12 | arbitrary variables. | ||
13 | |||
14 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
15 | --- | ||
16 | xorg-server.m4 | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/xorg-server.m4 b/xorg-server.m4 | ||
20 | index 18255b91a..195bda5d8 100644 | ||
21 | --- a/xorg-server.m4 | ||
22 | +++ b/xorg-server.m4 | ||
23 | @@ -31,7 +31,7 @@ dnl | ||
24 | AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ | ||
25 | AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | ||
26 | SAVE_CFLAGS="$CFLAGS" | ||
27 | - CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" | ||
28 | + CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`" | ||
29 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | ||
30 | #include "xorg-server.h" | ||
31 | #if !defined $1 | ||
32 | -- | ||
33 | 2.11.0 | ||
34 | |||