diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2008-11-05 00:03:56 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-11-05 00:03:56 +0000 |
commit | d9dfbf4e1295d5fc6f7233ae774a78633e887ded (patch) | |
tree | bd43a52d698ba361fcf81b382f7cd30bae619237 /meta/packages/xorg-xserver | |
parent | f8e9dcb5aec368e135107a08a94cb515b919d051 (diff) | |
download | poky-d9dfbf4e1295d5fc6f7233ae774a78633e887ded.tar.gz |
xserver-x86: Fix m4 autoconf macro
Diffstat (limited to 'meta/packages/xorg-xserver')
6 files changed, 23 insertions, 12 deletions
diff --git a/meta/packages/xorg-xserver/files/macro_tweak.patch b/meta/packages/xorg-xserver/files/macro_tweak.patch new file mode 100644 index 0000000000..6998adffe9 --- /dev/null +++ b/meta/packages/xorg-xserver/files/macro_tweak.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Index: xorg-server-1.5.0/xorg-server.m4 | ||
2 | =================================================================== | ||
3 | --- xorg-server-1.5.0.orig/xorg-server.m4 2007-05-29 20:36:51.000000000 +0100 | ||
4 | +++ xorg-server-1.5.0/xorg-server.m4 2008-11-04 23:56:55.000000000 +0000 | ||
5 | @@ -28,9 +28,12 @@ | ||
6 | # Checks for the $1 define in xorg-server.h (from the sdk). If it | ||
7 | # is defined, then add $1 to $REQUIRED_MODULES. | ||
8 | |||
9 | +m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) | ||
10 | + | ||
11 | AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ | ||
12 | + PKG_PROG_PKG_CONFIG | ||
13 | SAVE_CFLAGS="$CFLAGS" | ||
14 | - CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" | ||
15 | + CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`pkg-config --variable=sdkdir xorg-server`" | ||
16 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | ||
17 | #include "xorg-server.h" | ||
18 | #if !defined $1 | ||
diff --git a/meta/packages/xorg-xserver/xserver-xf86-common.inc b/meta/packages/xorg-xserver/xserver-xf86-common.inc index 17d88bb17e..d31e97a0e2 100644 --- a/meta/packages/xorg-xserver/xserver-xf86-common.inc +++ b/meta/packages/xorg-xserver/xserver-xf86-common.inc | |||
@@ -31,14 +31,7 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ | |||
31 | 31 | ||
32 | CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf" | 32 | CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf" |
33 | 33 | ||
34 | # xorg-server.m4 contains a macro used by the xf86-*-* drivers to check for | 34 | SRC_URI += "file://macro_tweak.patch;patch=1" |
35 | # server extensions. The problem is that it modifies CFLAGS during the drivers | ||
36 | # ./configure with -I`pkg-config --variable=sdkdir xorg-server` and the sdkdir | ||
37 | # variable doesn't point into the staging area and so causes | ||
38 | # "CROSS COMPILE Badness" warnings. | ||
39 | do_configure_prepend () { | ||
40 | sed -i "s|\`pkg-config --variable=sdkdir xorg-server\`|${STAGING_DIR}/${HOST_SYS}/\`pkg-config --variable=sdkdir xorg-server\`|" xorg-server.m4 | ||
41 | } | ||
42 | 35 | ||
43 | do_stage() { | 36 | do_stage() { |
44 | autotools_stage_all | 37 | autotools_stage_all |
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb index c9bd3f9fbe..6144f755d5 100644 --- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb +++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require xserver-xf86-dri-lite.inc | 1 | require xserver-xf86-dri-lite.inc |
2 | 2 | ||
3 | PE = "1" | 3 | PE = "1" |
4 | PR = "r3" | 4 | PR = "r4" |
5 | 5 | ||
6 | PROTO_DEPS += "xf86driproto" | 6 | PROTO_DEPS += "xf86driproto" |
7 | 7 | ||
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb index e8706903ba..1d5c218684 100644 --- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb +++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require xserver-xf86-dri-lite.inc | 1 | require xserver-xf86-dri-lite.inc |
2 | 2 | ||
3 | PE = "1" | 3 | PE = "1" |
4 | PR = "r3" | 4 | PR = "r4" |
5 | PV = "1.5.99.1+git${SRCREV}" | 5 | PV = "1.5.99.1+git${SRCREV}" |
6 | 6 | ||
7 | PROTO_DEPS += "xf86driproto" | 7 | PROTO_DEPS += "xf86driproto" |
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb b/meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb index 694979a22a..029efa3835 100644 --- a/meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb +++ b/meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require xserver-xf86-dri-lite.inc | 1 | require xserver-xf86-dri-lite.inc |
2 | 2 | ||
3 | PR = "r0" | 3 | PR = "r1" |
4 | PV = "1.5.99.1+git${SRCREV}" | 4 | PV = "1.5.99.1+git${SRCREV}" |
5 | 5 | ||
6 | PROTO_DEPS += "dri2proto" | 6 | PROTO_DEPS += "dri2proto" |
diff --git a/meta/packages/xorg-xserver/xserver-xf86-lite_1.5.0.bb b/meta/packages/xorg-xserver/xserver-xf86-lite_1.5.0.bb index d16e7b085d..15e7763db2 100644 --- a/meta/packages/xorg-xserver/xserver-xf86-lite_1.5.0.bb +++ b/meta/packages/xorg-xserver/xserver-xf86-lite_1.5.0.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require xserver-xf86-lite.inc | 1 | require xserver-xf86-lite.inc |
2 | 2 | ||
3 | PR = "r0" | 3 | PR = "r1" |
4 | 4 | ||
5 | SRC_URI += "file://drmfix.patch;patch=1 \ | 5 | SRC_URI += "file://drmfix.patch;patch=1 \ |
6 | file://libdri-xinerama-symbol.patch;patch=1 " | 6 | file://libdri-xinerama-symbol.patch;patch=1 " |