summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-08-22 13:12:45 +0000
committerRichard Purdie <richard@openedhand.com>2007-08-22 13:12:45 +0000
commite7581b58f4f3dc1b1f3994c7d4dc3d46779a1bb7 (patch)
treea32ab7b337d3b3326a35a2d64a4ccdbd082949b1
parentc09b63e6edf1ca4b1b64257c15f6b2f002fa8d8d (diff)
downloadpoky-e7581b58f4f3dc1b1f3994c7d4dc3d46779a1bb7.tar.gz
libx11: Disable makekeys properly allowing the package to rebuild without weird failures
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2537 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/xorg-lib/files/x11_disable_makekeys.patch30
-rw-r--r--meta/packages/xorg-lib/libx11_1.1.2.bb17
2 files changed, 42 insertions, 5 deletions
diff --git a/meta/packages/xorg-lib/files/x11_disable_makekeys.patch b/meta/packages/xorg-lib/files/x11_disable_makekeys.patch
new file mode 100644
index 0000000000..2a8a55cdf5
--- /dev/null
+++ b/meta/packages/xorg-lib/files/x11_disable_makekeys.patch
@@ -0,0 +1,30 @@
1---
2 src/util/Makefile.am | 17 -----------------
3 1 file changed, 17 deletions(-)
4
5Index: libX11-1.1.2/src/util/Makefile.am
6===================================================================
7--- libX11-1.1.2.orig/src/util/Makefile.am 2007-08-22 14:17:42.000000000 +0100
8+++ libX11-1.1.2/src/util/Makefile.am 2007-08-22 14:18:04.000000000 +0100
9@@ -1,21 +1,4 @@
10 # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
11
12-noinst_PROGRAMS=makekeys
13-
14-makekeys_CFLAGS=$(X11_CFLAGS)
15-
16-#override CC = gcc
17-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
18-
19 EXTRA_DIST = mkks.sh
20
21-if LINT
22-# Check source code with tools like lint & sparse
23-
24-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
25- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
26-
27-lint:
28- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
29-
30-endif LINT
diff --git a/meta/packages/xorg-lib/libx11_1.1.2.bb b/meta/packages/xorg-lib/libx11_1.1.2.bb
index bab2277fd0..93ad71f466 100644
--- a/meta/packages/xorg-lib/libx11_1.1.2.bb
+++ b/meta/packages/xorg-lib/libx11_1.1.2.bb
@@ -5,17 +5,24 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
5 libxdmcp xf86bigfontproto kbproto inputproto" 5 libxdmcp xf86bigfontproto kbproto inputproto"
6PROVIDES = "virtual/libx11" 6PROVIDES = "virtual/libx11"
7PE = "1" 7PE = "1"
8PR = "r2"
8 9
9XORG_PN = "libX11" 10XORG_PN = "libX11"
10 11
12SRC_URI += "file://x11_disable_makekeys.patch;patch=1"
13
14
11EXTRA_OECONF += "--without-xcb" 15EXTRA_OECONF += "--without-xcb"
12 16
13do_compile() { 17do_compile() {
14 ( 18 (
15 unset CC LD CXX CCLD 19 unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
16 oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys 20 cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
17 ) 21 # mv to stop it getting rebuilt
18 oe_runmake 22 mv makekeys.c makekeys.c.orig
23 cd ../../
24 ) || exit 1
25 oe_runmake
19} 26}
20 27
21FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" 28FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"