summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-01-14 17:05:32 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-01-14 17:05:32 +0000
commit2debb77ab25190353f60b90bbdbb68e381199198 (patch)
tree3d5be0d9b8ed404ae5d4b138e75dbf1b1f06b3e0 /meta/packages
parentb07628bf26785801fc0e277e989fb981e7bc3317 (diff)
downloadpoky-2debb77ab25190353f60b90bbdbb68e381199198.tar.gz
libx11-git: Disable dolt
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/xorg-lib/libx11-git/nodolt.patch12
-rw-r--r--meta/packages/xorg-lib/libx11-trim_git.bb2
-rw-r--r--meta/packages/xorg-lib/libx11_git.bb2
-rw-r--r--meta/packages/xorg-lib/libx11_git.inc3
4 files changed, 16 insertions, 3 deletions
diff --git a/meta/packages/xorg-lib/libx11-git/nodolt.patch b/meta/packages/xorg-lib/libx11-git/nodolt.patch
new file mode 100644
index 0000000000..ecf9625cad
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-git/nodolt.patch
@@ -0,0 +1,12 @@
1Index: libX11-1.2.1/configure.ac
2===================================================================
3--- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100
4+++ libX11-1.2.1/configure.ac 2009-07-02 14:08:01.000000000 +0100
5@@ -20,7 +20,6 @@
6
7 # Checks for programs.
8 AC_PROG_LIBTOOL
9-DOLT
10 AC_PROG_CC
11 XORG_CWARNFLAGS
12
diff --git a/meta/packages/xorg-lib/libx11-trim_git.bb b/meta/packages/xorg-lib/libx11-trim_git.bb
index 45ec225b43..99426c3c5d 100644
--- a/meta/packages/xorg-lib/libx11-trim_git.bb
+++ b/meta/packages/xorg-lib/libx11-trim_git.bb
@@ -1,7 +1,7 @@
1require libx11.inc 1require libx11.inc
2require libx11_git.inc 2require libx11_git.inc
3 3
4PR = "r1" 4PR = "r2"
5 5
6DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" 6DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
7 7
diff --git a/meta/packages/xorg-lib/libx11_git.bb b/meta/packages/xorg-lib/libx11_git.bb
index 1234659fa6..a976a16cd3 100644
--- a/meta/packages/xorg-lib/libx11_git.bb
+++ b/meta/packages/xorg-lib/libx11_git.bb
@@ -1,7 +1,7 @@
1require libx11.inc 1require libx11.inc
2require libx11_git.inc 2require libx11_git.inc
3 3
4PR = "r1" 4PR = "r2"
5 5
6DEPENDS = "xproto xextproto xcmiscproto xf86bigfontproto kbproto inputproto \ 6DEPENDS = "xproto xextproto xcmiscproto xf86bigfontproto kbproto inputproto \
7 bigreqsproto xtrans libxau libxcb libxdmcp util-macros gettext" 7 bigreqsproto xtrans libxau libxcb libxdmcp util-macros gettext"
diff --git a/meta/packages/xorg-lib/libx11_git.inc b/meta/packages/xorg-lib/libx11_git.inc
index a543826043..40d806178f 100644
--- a/meta/packages/xorg-lib/libx11_git.inc
+++ b/meta/packages/xorg-lib/libx11_git.inc
@@ -4,7 +4,8 @@ SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
4S = "${WORKDIR}/git" 4S = "${WORKDIR}/git"
5 5
6SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ 6SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
7 file://include_fix.patch;patch=1" 7 file://include_fix.patch;patch=1 \
8 file://nodolt.patch;patch=1"
8 9
9FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11-git" 10FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11-git"
10FILESPATH = "${FILE_DIRNAME}/libx11-git" 11FILESPATH = "${FILE_DIRNAME}/libx11-git"