From: Saul Wold <sgw@linux.intel.com>
To: b28495@freescale.com, openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 3/3] wayland-native: disable macro checks not used for scanner
Date: Fri, 17 Jan 2014 09:55:34 -0800 [thread overview]
Message-ID: <52D96E96.1080001@linux.intel.com> (raw)
In-Reply-To: <1389692997-5088-3-git-send-email-b28495@freescale.com>
On 01/14/2014 01:49 AM, b28495@freescale.com wrote:
> From: Ting Liu <b28495@freescale.com>
>
> 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)
>
> Signed-off-by: Ting Liu <b28495@freescale.com>
> ---
> ...disable-macro-checks-not-used-for-scanner.patch | 52 ++++++++++++++++++++
> meta/recipes-graphics/wayland/wayland_1.3.0.bb | 5 ++-
> 2 files changed, 56 insertions(+), 1 deletions(-)
> create mode 100644 meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch
>
> 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 0000000..8a22079
> --- /dev/null
> +++ b/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch
> @@ -0,0 +1,52 @@
> +From 0af87a0382ffa4f1f6c81960d5f2ff07d3726529 Mon Sep 17 00:00:00 2001
> +From: Ting Liu <b28495@freescale.com>
> +Date: Mon, 13 Jan 2014 16:49:45 +0800
> +Subject: [PATCH] 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)
> +
Missing the Upstream-Status: Tag
> +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
> +index fa924ae..bf1b85a 100644
> +--- 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
> +
> diff --git a/meta/recipes-graphics/wayland/wayland_1.3.0.bb b/meta/recipes-graphics/wayland/wayland_1.3.0.bb
> index 212e08a..a60d02a 100644
> --- a/meta/recipes-graphics/wayland/wayland_1.3.0.bb
> +++ b/meta/recipes-graphics/wayland/wayland_1.3.0.bb
> @@ -14,7 +14,10 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
> SRC_URI[md5sum] = "d16d27081e0871de82d08840c2f133fc"
> SRC_URI[sha256sum] = "2e817685f68a26acd19964d69ddbc4549ba5412114ad95e1a9f5934cce470d6e"
>
> -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 \
> +"
>
> inherit autotools pkgconfig
>
>
prev parent reply other threads:[~2014-01-17 17:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-14 9:49 [PATCH 1/3] dbus: Add missing RDEPENDS of base-files b28495
2014-01-14 9:49 ` [PATCH 2/3] kmod-native: Only use O_CLOEXEC if it is defined b28495
2014-01-14 10:17 ` Robert Yang
2014-01-14 10:21 ` Burton, Ross
2014-01-14 9:49 ` [PATCH 3/3] wayland-native: disable macro checks not used for scanner b28495
2014-01-17 17:55 ` Saul Wold [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52D96E96.1080001@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=b28495@freescale.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.