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.inc | |
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.inc')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 89318e53c5..489a428500 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |||
@@ -17,7 +17,6 @@ INC_PR = "r8" | |||
17 | 17 | ||
18 | XORG_PN = "xorg-server" | 18 | XORG_PN = "xorg-server" |
19 | SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" | 19 | SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" |
20 | SRC_URI += "file://macro_tweak.patch" | ||
21 | 20 | ||
22 | S = "${WORKDIR}/${XORG_PN}-${PV}" | 21 | S = "${WORKDIR}/${XORG_PN}-${PV}" |
23 | 22 | ||