sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Ross Burton 2013-04-12 11:40:01 +01:00 committed by Richard Purdie
parent bd25074178
commit 06cce092ec
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
meta/recipes-graphics/wayland/wayland/just-scanner.patch Normal file
View File

@ -0,0 +1,36 @@
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:
| wayland-1.0.6/src/wayland-server.c:1245: error: 'O_CLOEXEC' undeclared (first use in this function)
| wayland-1.0.6/src/event-loop.c:34:25: error: sys/timerfd.h: No such file or directory
| wayland-1.0.6/src/event-loop.c:199: error: 'CLOCK_MONOTONIC' undeclared (first use in this function)
| wayland-1.0.6/src/event-loop.c:199: error: 'TFD_CLOEXEC' undeclared (first use in this function)
| wayland-1.0.6/src/event-loop.c:268: error: 'SFD_CLOEXEC' undeclared (first use in this function)
Upstream-Status: Inappropriate
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/Makefile.am b/Makefile.am
index 306d7b3..571fe89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ if BUILD_DOCS
doc_subdir = doc
endif
-SUBDIRS = src protocol $(doc_subdir) tests cursor
+SUBDIRS = src protocol $(doc_subdir)
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
diff --git a/src/Makefile.am b/src/Makefile.am
index e1d04ea..702342e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libwayland-server.la libwayland-client.la
+#lib_LTLIBRARIES = libwayland-server.la libwayland-client.la
noinst_LTLIBRARIES = libwayland-util.la
include_HEADERS = \

2
meta/recipes-graphics/wayland/wayland_1.0.6.bb
View File

@ -16,6 +16,8 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "936a2590aea69fa3c0cf234d54b9137c"
SRC_URI[sha256sum] = "f52a012df699eff434b0f49e56000d6978b5f781048402ca8e0232242970fc49"
SRC_URI_append_class-native = " file://just-scanner.patch"
inherit autotools pkgconfig
# We need wayland-native for the wayland-scanner utility