diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2008-03-16 12:05:46 +0000 |
|---|---|---|
| committer | Philipp Zabel <philipp.zabel@gmail.com> | 2008-03-16 12:05:46 +0000 |
| commit | 38d7471a4ad910f5a07d83c5d4c7c6bd4a6828da (patch) | |
| tree | 7df8b2fe5034b5ad384c832655e63268f273b707 /packages/xorg-xserver | |
| parent | 5263c836a2381d4dee6a64f2da05e7b6231e6e77 (diff) | |
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.
Diffstat (limited to 'packages/xorg-xserver')
| -rw-r--r-- | packages/xorg-xserver/files/sysroot_fix.patch | 13 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg_1.4.bb | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/packages/xorg-xserver/files/sysroot_fix.patch b/packages/xorg-xserver/files/sysroot_fix.patch new file mode 100644 index 0000000000..59753d5803 --- /dev/null +++ b/packages/xorg-xserver/files/sysroot_fix.patch @@ -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 diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb index b89be011fa..ee84cac779 100644 --- a/packages/xorg-xserver/xserver-xorg_1.4.bb +++ b/packages/xorg-xserver/xserver-xorg_1.4.bb @@ -3,9 +3,11 @@ require xorg-xserver-common.inc 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" |