diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-11 11:36:37 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-11 11:37:33 +0100 |
commit | 836bddc71e987ab343363047bc29b311268fbe89 (patch) | |
tree | 95f0e186e7b6e9643fb92115ba5a9f27c9b6dfb3 | |
parent | ee13bb0b1ae0851dac08c8ea83048d9721932e23 (diff) | |
download | poky-836bddc71e987ab343363047bc29b311268fbe89.tar.gz |
xserver-kdrive: Disable dolt to fix build failures
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch | 12 | ||||
-rw-r--r-- | meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch new file mode 100644 index 0000000000..6b34032a39 --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch | |||
@@ -0,0 +1,12 @@ | |||
1 | Index: git/configure.ac | ||
2 | =================================================================== | ||
3 | --- git.orig/configure.ac 2009-01-15 20:35:31.000000000 +0000 | ||
4 | +++ git/configure.ac 2009-01-15 20:35:38.000000000 +0000 | ||
5 | @@ -62,7 +62,6 @@ | ||
6 | AC_LIBTOOL_WIN32_DLL | ||
7 | AC_DISABLE_STATIC | ||
8 | AC_PROG_LIBTOOL | ||
9 | -DOLT | ||
10 | AC_PROG_MAKE_SET | ||
11 | PKG_PROG_PKG_CONFIG | ||
12 | AC_PROG_LEX | ||
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb index f0fb6e2d1f..7ca88e64e2 100644 --- a/meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb +++ b/meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb | |||
@@ -7,7 +7,7 @@ RDEPENDS_${PN} += "xkeyboard-config" | |||
7 | EXTRA_OECONF += "--disable-glx" | 7 | EXTRA_OECONF += "--disable-glx" |
8 | 8 | ||
9 | PE = "1" | 9 | PE = "1" |
10 | PR = "r24" | 10 | PR = "r25" |
11 | 11 | ||
12 | SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ | 12 | SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ |
13 | file://extra-kmodes.patch;patch=1 \ | 13 | file://extra-kmodes.patch;patch=1 \ |
@@ -22,6 +22,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ | |||
22 | file://hide-cursor-and-ppm-root.patch;patch=1 \ | 22 | file://hide-cursor-and-ppm-root.patch;patch=1 \ |
23 | file://fbdev_xrandr_ioctl.patch;patch=1 \ | 23 | file://fbdev_xrandr_ioctl.patch;patch=1 \ |
24 | file://fix-newer-xorg-headers.patch;patch=1 \ | 24 | file://fix-newer-xorg-headers.patch;patch=1 \ |
25 | file://crosscompile.patch;patch=1" | 25 | file://crosscompile.patch;patch=1 \ |
26 | file://nodolt.patch;patch=1" | ||
26 | 27 | ||
27 | S = "${WORKDIR}/xorg-server-${PV}" | 28 | S = "${WORKDIR}/xorg-server-${PV}" |