summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-04-12 11:40:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-12 17:00:45 +0100
commit06cce092ec2a424dae7c0152443fb191306ba892 (patch)
treebbaa5b21f716ca42c2b495d2350db5fee5e60727 /meta/recipes-graphics
parentbd25074178f20bf17cb02df949d2c42d8eaa678a (diff)
downloadpoky-06cce092ec2a424dae7c0152443fb191306ba892.tar.gz
wayland: only build the scanner in wayland-native
We only build wayland-native for the scanner, so disable the bits we don't actually need. This gives us a small speed up but importantly should allow wayland-native to compile on older hosts such as CentOS 5 which currently fails. [ YOCTO #4245 ] (From OE-Core rev: bfbe9b6a4fd7a8b5e5827847c2adff894e609e94) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/wayland/wayland/just-scanner.patch36
-rw-r--r--meta/recipes-graphics/wayland/wayland_1.0.6.bb2
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-graphics/wayland/wayland/just-scanner.patch b/meta/recipes-graphics/wayland/wayland/just-scanner.patch
new file mode 100644
index 0000000000..234a9c5f79
--- /dev/null
+++ b/meta/recipes-graphics/wayland/wayland/just-scanner.patch
@@ -0,0 +1,36 @@
1We only build wayland-native for the scanner, so disable the bits we don't
2actually need. This gives us a small speed up but importantly should allow
3wayland-native to compile on older hosts such as CentOS 5 which currently fails:
4
5| wayland-1.0.6/src/wayland-server.c:1245: error: 'O_CLOEXEC' undeclared (first use in this function)
6| wayland-1.0.6/src/event-loop.c:34:25: error: sys/timerfd.h: No such file or directory
7| wayland-1.0.6/src/event-loop.c:199: error: 'CLOCK_MONOTONIC' undeclared (first use in this function)
8| wayland-1.0.6/src/event-loop.c:199: error: 'TFD_CLOEXEC' undeclared (first use in this function)
9| wayland-1.0.6/src/event-loop.c:268: error: 'SFD_CLOEXEC' undeclared (first use in this function)
10
11Upstream-Status: Inappropriate
12Signed-off-by: Ross Burton <ross.burton@intel.com>
13
14diff --git a/Makefile.am b/Makefile.am
15index 306d7b3..571fe89 100644
16--- a/Makefile.am
17+++ b/Makefile.am
18@@ -2,7 +2,7 @@ if BUILD_DOCS
19 doc_subdir = doc
20 endif
21
22-SUBDIRS = src protocol $(doc_subdir) tests cursor
23+SUBDIRS = src protocol $(doc_subdir)
24
25 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
26
27diff --git a/src/Makefile.am b/src/Makefile.am
28index e1d04ea..702342e 100644
29--- a/src/Makefile.am
30+++ b/src/Makefile.am
31@@ -1,4 +1,4 @@
32-lib_LTLIBRARIES = libwayland-server.la libwayland-client.la
33+#lib_LTLIBRARIES = libwayland-server.la libwayland-client.la
34 noinst_LTLIBRARIES = libwayland-util.la
35
36 include_HEADERS = \
diff --git a/meta/recipes-graphics/wayland/wayland_1.0.6.bb b/meta/recipes-graphics/wayland/wayland_1.0.6.bb
index 1585479f5c..7c18979af7 100644
--- a/meta/recipes-graphics/wayland/wayland_1.0.6.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.0.6.bb
@@ -16,6 +16,8 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
16SRC_URI[md5sum] = "936a2590aea69fa3c0cf234d54b9137c" 16SRC_URI[md5sum] = "936a2590aea69fa3c0cf234d54b9137c"
17SRC_URI[sha256sum] = "f52a012df699eff434b0f49e56000d6978b5f781048402ca8e0232242970fc49" 17SRC_URI[sha256sum] = "f52a012df699eff434b0f49e56000d6978b5f781048402ca8e0232242970fc49"
18 18
19SRC_URI_append_class-native = " file://just-scanner.patch"
20
19inherit autotools pkgconfig 21inherit autotools pkgconfig
20 22
21# We need wayland-native for the wayland-scanner utility 23# We need wayland-native for the wayland-scanner utility