mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-02 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

wayland-native: disable unused macro checks to fix build issue on Centos5.x

Browse Source 
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>
This commit is contained in:
Ting Liu
2014-03-28 17:42:40 +08:00
committed by Richard Purdie
parent ae7a07976f
commit 8b63ff3586
2 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch Normal file
View File

@@ -0,0 +1,50 @@
disable macro checks not used for scanner
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)
Upstream-Status: Pending
Signed-off-by: Ting Liu <b28495@freescale.com>
---
configure.ac | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -41,16 +41,16 @@ AC_SUBST(GCC_CFLAGS)
AC_CHECK_FUNCS([accept4 mkostemp])
-AC_CHECK_DECL(SFD_CLOEXEC,[],
- [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")],
- [[#include <sys/signalfd.h>]])
-AC_CHECK_DECL(TFD_CLOEXEC,[],
- [AC_MSG_ERROR("TFD_CLOEXEC is needed to compile wayland")],
- [[#include <sys/timerfd.h>]])
-AC_CHECK_DECL(CLOCK_MONOTONIC,[],
- [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile wayland")],
- [[#include <time.h>]])
-AC_CHECK_HEADERS([execinfo.h])
+##AC_CHECK_DECL(SFD_CLOEXEC,[],
+# [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")],
+# [[#include <sys/signalfd.h>]])
+#AC_CHECK_DECL(TFD_CLOEXEC,[],
+# [AC_MSG_ERROR("TFD_CLOEXEC is needed to compile wayland")],
+# [[#include <sys/timerfd.h>]])
+#AC_CHECK_DECL(CLOCK_MONOTONIC,[],
+# [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile wayland")],
+# [[#include <time.h>]])
+#AC_CHECK_HEADERS([execinfo.h])
AC_ARG_ENABLE([scanner],
[AC_HELP_STRING([--disable-scanner],
--
1.8.3.2

4
meta/recipes-graphics/wayland/wayland_1.4.0.bb
View File

@@ -14,7 +14,9 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "332cf9191837be12638a29265ed7cf46"
SRC_URI[sha256sum] = "18f33b9f15b4c8b662fb1968e7636e7926b419dfc48de8a164b3a3d7095c5a58"
SRC_URI_append_class-native = " file://just-scanner.patch"
SRC_URI_append_class-native = " file://just-scanner.patch \
file://disable-macro-checks-not-used-for-scanner.patch \
"
EXTRA_OECONF_class-native = "--disable-documentation --enable-scanner"
inherit autotools pkgconfig