summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTing Liu <b28495@freescale.com>2014-03-28 17:42:40 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-01 23:37:02 +0100
commit8b63ff3586ddeec7dc1fda271a98d6af019664c0 (patch)
tree4631ec91e9e0e49d317a3b7fb2088f669972bd91 /meta
parentae7a07976fbe7a93dbbd70db3f24a32156319756 (diff)
downloadpoky-8b63ff3586ddeec7dc1fda271a98d6af019664c0.tar.gz
wayland-native: disable unused macro checks to fix build issue on Centos5.x
We only build wayland-native for the scanner, so disable the bits we don't actually need. This avoid build issue on older distro such as Centos 5.x: | error: 'O_CLOEXEC' undeclared (first use in this function) | error: sys/timerfd.h: No such file or directory | error: 'CLOCK_MONOTONIC' undeclared (first use in this function) | error: 'TFD_CLOEXEC' undeclared (first use in this function) | error: 'SFD_CLOEXEC' undeclared (first use in this function) (From OE-Core rev: f6d5343ccb97913a874b894fd7405abad59746eb) Signed-off-by: Ting Liu <b28495@freescale.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch50
-rw-r--r--meta/recipes-graphics/wayland/wayland_1.4.0.bb4
2 files changed, 53 insertions, 1 deletions
diff --git a/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch b/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch
new file mode 100644
index 0000000000..bf499bb238
--- /dev/null
+++ b/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch
@@ -0,0 +1,50 @@
1disable macro checks not used for scanner
2
3We only build wayland-native for the scanner, so disable the bits we don't
4actually need. This avoid build issue on older distro such as Centos 5.x:
5| error: 'O_CLOEXEC' undeclared (first use in this function)
6| error: sys/timerfd.h: No such file or directory
7| error: 'CLOCK_MONOTONIC' undeclared (first use in this function)
8| error: 'TFD_CLOEXEC' undeclared (first use in this function)
9| error: 'SFD_CLOEXEC' undeclared (first use in this function)
10
11Upstream-Status: Pending
12
13Signed-off-by: Ting Liu <b28495@freescale.com>
14---
15 configure.ac | 20 ++++++++++----------
16 1 file changed, 10 insertions(+), 10 deletions(-)
17
18diff --git a/configure.ac b/configure.ac
19--- a/configure.ac
20+++ b/configure.ac
21@@ -41,16 +41,16 @@ AC_SUBST(GCC_CFLAGS)
22
23 AC_CHECK_FUNCS([accept4 mkostemp])
24
25-AC_CHECK_DECL(SFD_CLOEXEC,[],
26- [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")],
27- [[#include <sys/signalfd.h>]])
28-AC_CHECK_DECL(TFD_CLOEXEC,[],
29- [AC_MSG_ERROR("TFD_CLOEXEC is needed to compile wayland")],
30- [[#include <sys/timerfd.h>]])
31-AC_CHECK_DECL(CLOCK_MONOTONIC,[],
32- [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile wayland")],
33- [[#include <time.h>]])
34-AC_CHECK_HEADERS([execinfo.h])
35+##AC_CHECK_DECL(SFD_CLOEXEC,[],
36+# [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")],
37+# [[#include <sys/signalfd.h>]])
38+#AC_CHECK_DECL(TFD_CLOEXEC,[],
39+# [AC_MSG_ERROR("TFD_CLOEXEC is needed to compile wayland")],
40+# [[#include <sys/timerfd.h>]])
41+#AC_CHECK_DECL(CLOCK_MONOTONIC,[],
42+# [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile wayland")],
43+# [[#include <time.h>]])
44+#AC_CHECK_HEADERS([execinfo.h])
45
46 AC_ARG_ENABLE([scanner],
47 [AC_HELP_STRING([--disable-scanner],
48--
491.8.3.2
50
diff --git a/meta/recipes-graphics/wayland/wayland_1.4.0.bb b/meta/recipes-graphics/wayland/wayland_1.4.0.bb
index 604b7f4c54..9f6419d5fd 100644
--- a/meta/recipes-graphics/wayland/wayland_1.4.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.4.0.bb
@@ -14,7 +14,9 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
14SRC_URI[md5sum] = "332cf9191837be12638a29265ed7cf46" 14SRC_URI[md5sum] = "332cf9191837be12638a29265ed7cf46"
15SRC_URI[sha256sum] = "18f33b9f15b4c8b662fb1968e7636e7926b419dfc48de8a164b3a3d7095c5a58" 15SRC_URI[sha256sum] = "18f33b9f15b4c8b662fb1968e7636e7926b419dfc48de8a164b3a3d7095c5a58"
16 16
17SRC_URI_append_class-native = " file://just-scanner.patch" 17SRC_URI_append_class-native = " file://just-scanner.patch \
18 file://disable-macro-checks-not-used-for-scanner.patch \
19 "
18EXTRA_OECONF_class-native = "--disable-documentation --enable-scanner" 20EXTRA_OECONF_class-native = "--disable-documentation --enable-scanner"
19 21
20inherit autotools pkgconfig 22inherit autotools pkgconfig