diff options
Diffstat (limited to 'meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/replace-pkgconfig-sdkdir-poking.patch')
-rw-r--r-- | meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/replace-pkgconfig-sdkdir-poking.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/replace-pkgconfig-sdkdir-poking.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/replace-pkgconfig-sdkdir-poking.patch deleted file mode 100644 index 3967c4c738..0000000000 --- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/replace-pkgconfig-sdkdir-poking.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | configury forces pkg-config to poke for sdkdir variable which | ||
2 | pkg-config happily returns but does not prepend sysroot to it | ||
3 | since thats only done for includes and libs. This then gets -I | ||
4 | prepended and added to CFLAGS. Guess what gcc cross gripes | ||
5 | about including host includes in cross builds but does not bail | ||
6 | out the build but it does not escape the wrath of our oe's | ||
7 | QA checks and rightly so. We replace use of sdkdir with | ||
8 | --cflags-only-I which returns the include paths correctly | ||
9 | pointing inside sysroot and not at the host includes and plus | ||
10 | includedir if you look inside the .pc file is assigned sdkdir | ||
11 | anyway so we do not lose anything | ||
12 | |||
13 | This m4 macro is included in other packages e.g. xf86-video-fbdev | ||
14 | which dont build on hosts which have installation of | ||
15 | xorg-xserver-dev because it gets this include poisoning | ||
16 | |||
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
18 | |||
19 | Upstream-status: Pending | ||
20 | |||
21 | Index: xorg-server-1.10.1/xorg-server.m4 | ||
22 | =================================================================== | ||
23 | --- xorg-server-1.10.1.orig/xorg-server.m4 | ||
24 | +++ xorg-server-1.10.1/xorg-server.m4 | ||
25 | @@ -31,7 +31,7 @@ dnl | ||
26 | AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ | ||
27 | AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | ||
28 | SAVE_CFLAGS="$CFLAGS" | ||
29 | - CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" | ||
30 | + CFLAGS="$CFLAGS `$PKG_CONFIG --cflags-only-I xorg-server`" | ||
31 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | ||
32 | #include "xorg-server.h" | ||
33 | #if !defined $1 | ||