summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
deleted file mode 100644
index 2ef9fa9fe4..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/22]
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 5f65a6246fe752764045dd1e38912f1dccec71e4 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Thu, 20 Sep 2018 20:12:24 +0100
7Subject: [PATCH] xorg-server.m4: just all cflags instead of just sdkdir
8
9Instead of fetching just the sdkdir variable of xorg-server using pkg-config,
10simply get all of the CFLAGS. Aside from completeness, this helps builds in
11sysroots as pkg-config knows what to do with --cflags but doesn't remap
12arbitrary variables.
13
14Signed-off-by: Ross Burton <ross.burton@intel.com>
15---
16 xorg-server.m4 | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/xorg-server.m4 b/xorg-server.m4
20index 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--
332.11.0
34