summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb5
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11.inc43
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch34
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb4
4 files changed, 16 insertions, 70 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
index cb9a5ef8bf..0a90f463be 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
@@ -3,10 +3,9 @@ require libx11.inc
3DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \ 3DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \
4this version." 4this version."
5 5
6PR = "${INC_PR}.3" 6PR = "${INC_PR}.4"
7 7
8SRC_URI += "file://x11_disable_makekeys.patch \ 8SRC_URI += "file://X18NCMSstubs.diff \
9 file://X18NCMSstubs.diff \
10 file://keysymdef_include.patch \ 9 file://keysymdef_include.patch \
11 file://fix-disable-xlocale.diff \ 10 file://fix-disable-xlocale.diff \
12 file://fix-utf8-wrong-define.patch \ 11 file://fix-utf8-wrong-define.patch \
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index d56aa23918..3ecd9e50b3 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -11,7 +11,7 @@ inherit siteinfo
11FILESPATH = "${FILE_DIRNAME}/libx11" 11FILESPATH = "${FILE_DIRNAME}/libx11"
12 12
13PE = "1" 13PE = "1"
14INC_PR = "r7" 14INC_PR = "r8"
15 15
16PROVIDES = "virtual/libx11" 16PROVIDES = "virtual/libx11"
17 17
@@ -22,12 +22,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
22DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto" 22DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto"
23DEPENDS += "xproto-native" 23DEPENDS += "xproto-native"
24 24
25PACKAGES =+ "${PN}-xcb"
26
27FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
28FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
29FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
30
31EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/" 25EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/"
32 26
33# Let people with incredibly archaic requirements enable Xcms and BigFont, but 27# Let people with incredibly archaic requirements enable Xcms and BigFont, but
@@ -36,29 +30,18 @@ PACKAGECONFIG ??= ""
36PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" 30PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"
37PACKAGECONFIG[bigfont] = "--enable-xf86bigfont,--disable-xf86bigfont,xf86bigfontproto" 31PACKAGECONFIG[bigfont] = "--enable-xf86bigfont,--disable-xf86bigfont,xf86bigfontproto"
38 32
39do_compile_prepend() { 33# src/util/makekeys needs to be compiled natively, so tell it what compiler to
40 cd ${S}/src/util 34# use.
41 mv makekeys.c.orig makekeys.c || true 35export CC_FOR_BUILD = "${BUILD_CC}"
42 touch makekeys-makekeys.o 36export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
43 ( 37export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
44 unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS 38export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS}"
45 # MIN_REHASH 10 is only in 1.0.1 39
46 sed -i -e 's:MIN_REHASH 10:MIN_REHASH 16:g' makekeys.c 40PACKAGES =+ "${PN}-xcb"
47 sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c 41
48 touch makekeys-makekeys.o; 42FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
49 if [ "${SITEINFO_BITS}" == "64" ]; then 43FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
50 ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -I${S}/include -o makekeys 44FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
51 else
52 ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -I${S}/include -o makekeys
53 fi
54 )
55 if [ "$?" != "0" ]; then
56 exit 1
57 fi
58 # mv to stop it getting rebuilt
59 mv makekeys.c makekeys.c.orig
60 cd ../../
61}
62 45
63# Multiple libx11 derivatives from from this file and are selected by virtual/libx11 46# Multiple libx11 derivatives from from this file and are selected by virtual/libx11
64# A world build should only build the correct version, not all of them. 47# A world build should only build the correct version, not all of them.
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
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
index 5a66eb5a0b..793496cef2 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
@@ -5,9 +5,7 @@ PR = "${INC_PR}.1"
5 5
6BBCLASSEXTEND = "native nativesdk" 6BBCLASSEXTEND = "native nativesdk"
7 7
8SRC_URI += " file://keysymdef_include.patch \ 8SRC_URI += "file://keysymdef_include.patch"
9 file://x11_disable_makekeys.patch \
10 "
11 9
12SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" 10SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6"
13SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" 11SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86"