summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-09-11 20:18:06 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-12 15:13:49 +0100
commitad02e381e1c0b92a45681572f95aa52a48d32e35 (patch)
tree0517c46d49193c0346ffac44d213c925d8c89130 /meta/recipes-graphics/xorg-lib/libx11
parentc2585592b54374a6f87a8afd10ae8eac35c1a34c (diff)
downloadpoky-ad02e381e1c0b92a45681572f95aa52a48d32e35.tar.gz
libx11: makekeys can be cross-compiled now, so don't hack around
(From OE-Core rev: 04c776956b98cc96c2c1a139bec0422feae1497d) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
deleted file mode 100644
index 69f9e6c4d6..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Upstream-Status: Pending
2
3Index: libX11-1.5.0/src/util/Makefile.am
4===================================================================
5--- libX11-1.5.0.orig/src/util/Makefile.am
6+++ libX11-1.5.0/src/util/Makefile.am
7@@ -1,27 +1,2 @@
8-
9-noinst_PROGRAMS=makekeys
10-
11-makekeys_CFLAGS = \
12- $(X11_CFLAGS) \
13- $(CWARNFLAGS)
14-
15-makekeys_CPPFLAGS = \
16- -I$(top_srcdir)/include
17-
18-CC = @CC_FOR_BUILD@
19-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
20-CFLAGS = @CFLAGS_FOR_BUILD@
21-LDFLAGS = @LDFLAGS_FOR_BUILD@
22-
23 EXTRA_DIST = mkks.sh
24
25-if LINT
26-# Check source code with tools like lint & sparse
27-
28-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
29- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
30-
31-lint:
32- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
33-
34-endif LINT