xserver-xorg_1.10.1.bb: Replace use of --variable=sdkdir with --cflags-only-I

This fixes the build failures of xf86-video-fbdev on build systems which
have xorg-xserver development packages installed.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

2 files changed, 35 insertions, 1 deletions

diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.1/replace-pkgconfig-sdkdir-poking.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.1/replace-pkgconfig-sdkdir-poking.patch
new file mode 100644
index 000000000..3967c4c73
--- /dev/null
+++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.1/replace-pkgconfig-sdkdir-poking.patch
@@ -0,0 +1,33 @@
+configury forces pkg-config to poke for sdkdir variable which 
+pkg-config happily returns but does not prepend sysroot to it
+since thats only done for includes and libs. This then gets -I
+prepended and added to CFLAGS. Guess what gcc cross gripes
+about including host includes in cross builds but does not bail
+out the build but it does not escape the wrath of our oe's
+QA checks and rightly so. We replace use of sdkdir with 
+--cflags-only-I which returns the include paths correctly
+pointing inside sysroot and not at the host includes and plus
+includedir if you look inside the .pc file is assigned sdkdir
+anyway so we do not lose anything
+
+This m4 macro is included in other packages e.g. xf86-video-fbdev
+which dont build on hosts which have installation of
+xorg-xserver-dev because it gets this include poisoning
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-status: Pending
+
+Index: xorg-server-1.10.1/xorg-server.m4
+===================================================================
+--- xorg-server-1.10.1.orig/xorg-server.m4
++++ xorg-server-1.10.1/xorg-server.m4
+@@ -31,7 +31,7 @@ dnl
+ AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
+        AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+        SAVE_CFLAGS="$CFLAGS"
+-       CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
++       CFLAGS="$CFLAGS `$PKG_CONFIG --cflags-only-I xorg-server`"
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "xorg-server.h"
+ #if !defined $1
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
index 7cb7339af..91bf4767e 100644
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
+++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
@@ -7,11 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native"
 PE = "2"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI += " \
             file://hack-fbdev-ignore-return-mode.patch \
             file://hack-assume-pixman-supports-overlapped-blt.patch \
+            file://replace-pkgconfig-sdkdir-poking.patch \
            "
 SRC_URI[md5sum] = "75f117c74f2ecaf9dd167f6a66ac98de"
 SRC_URI[sha256sum] = "143c7c3d7d4428352e1153dffa34fd64af391f72d30b2a03e911e54e36f00b5d"