diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 22:41:29 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 22:41:29 +0300 |
| commit | 21f9b84b4b729fbd7acbd465e7a3f726e4d20f91 (patch) | |
| tree | eb2d091d427ca0813b445509d59cc8e27e8ad25f /yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch | |
| parent | 101cef31e2bf54c678501155cd2106251acbd076 (diff) | |
| parent | c124f4f2e04dca16a428a76c89677328bc7bf908 (diff) | |
| download | openbmc-21f9b84b4b729fbd7acbd465e7a3f726e4d20f91.tar.xz | |
Merge commit 'c124f4f2e04dca16a428a76c89677328bc7bf908' as 'yocto-poky'
Diffstat (limited to 'yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch')
| -rw-r--r-- | yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch new file mode 100644 index 000000000..ec0eea6ca --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch @@ -0,0 +1,25 @@ +This is the revised version of files/macro_tweak.patch for +xorg-server 1.8.99.904 and newer. + +Upstream-Status: Pending + +Signed-off-by: Yu Ke <ke.yu@intel.com> + +diff --git a/xorg-server.m4 b/xorg-server.m4 +index bdecf62..040fdb8 100644 +--- a/xorg-server.m4 ++++ b/xorg-server.m4 +@@ -28,10 +28,12 @@ dnl + # Checks for the $1 define in xorg-server.h (from the sdk). If it + # is defined, then add $1 to $REQUIRED_MODULES. + ++m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) ++ + 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 -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include "xorg-server.h" + #if !defined $1 |