[oe-commits] org.oe.dev xserver-xorg-1.4: add a workaround to xorg-xserver.m4

[pH5 commit]

xserver-xorg-1.4: add a workaround to xorg-xserver.m4
* stops cross compiling badness during xorg drivers do_configure:
  `pkg-config --variable=sdkdir xorg-server` does not prepent sysroot,
  so use `pkg-config --cflags xorg-server` instead.

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: f8231bbc1ede045535e37feb2970dbc1d70751c8
ViewMTN: http://monotone.openembedded.org/revision/info/f8231bbc1ede045535e37feb2970dbc1d70751c8
Files:
1
packages/xorg-xserver/files/sysroot_fix.patch
packages/xorg-xserver/xserver-xorg_1.4.bb
Diffs:

#
# mt diff -r219fa4485d47101df96e2d47c358fe5617f1f2d8 -rf8231bbc1ede045535e37feb2970dbc1d70751c8
#
#
#
# add_file "packages/xorg-xserver/files/sysroot_fix.patch"
#  content [4fd50a4fa4f03b640617df6759ac8cc2c4a65ec9]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.4.bb"
#  from [390cc0513bf74cbc87ed0298fcaf45b4df70d20b]
#    to [b205054696412235974c4bc8ba8c5ab1d7eb3104]
#
============================================================
--- packages/xorg-xserver/files/sysroot_fix.patch	4fd50a4fa4f03b640617df6759ac8cc2c4a65ec9
+++ packages/xorg-xserver/files/sysroot_fix.patch	4fd50a4fa4f03b640617df6759ac8cc2c4a65ec9
@@ -0,0 +1,13 @@
+Index: xorg-server-1.4/xorg-server.m4
+===================================================================
+--- xorg-server-1.4.orig/xorg-server.m4	2008-03-15 20:09:36.000000000 +0100
++++ xorg-server-1.4/xorg-server.m4	2008-03-15 20:09:51.000000000 +0100
+@@ -30,7 +30,7 @@
+ 
+ AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
+ 	SAVE_CFLAGS="$CFLAGS"
+-	CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
++	CFLAGS="$CFLAGS `pkg-config --cflags xorg-server`"
+ 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "xorg-server.h"
+ #if !defined $1
============================================================
--- packages/xorg-xserver/xserver-xorg_1.4.bb	390cc0513bf74cbc87ed0298fcaf45b4df70d20b
+++ packages/xorg-xserver/xserver-xorg_1.4.bb	b205054696412235974c4bc8ba8c5ab1d7eb3104
@@ -3,9 +3,11 @@ PE = "1"
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 PE = "1"
+PR = "r1"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
-            file://pkgconfig_fix.patch;patch=1"
+            file://pkgconfig_fix.patch;patch=1 \
+            file://sysroot_fix.patch;patch=1"
 
 MESA_VER = "7.0.2"