[OE-core] [PATCH 1/1] fontconfig: Fix define for HAVE_POSIX_FADVISE

[Burton, Ross]

Please send this upstream.

Ross

On Thu, 24 Jan 2019 at 06:46, Robert Yang <liezhi.yang at windriver.com> wrote:
>
> Otherwise, there would be build errors in the following 2 cases:
> * define HAVE_POSIX_FADVISE
> Or:
> * undef HAVE_POSIX_FADVISE
>
> Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
> ---
>  ...cache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch | 33 ++++++++++++++++++++++
>  .../fontconfig/fontconfig_2.12.6.bb                |  1 +
>  2 files changed, 34 insertions(+)
>  create mode 100644 meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch
>
> diff --git a/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch b/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch
> new file mode 100644
> index 0000000..07b2d65
> --- /dev/null
> +++ b/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch
> @@ -0,0 +1,33 @@
> +From ab9522177a8396a51812fdbebb6387df451a8499 Mon Sep 17 00:00:00 2001
> +From: Robert Yang <liezhi.yang at windriver.com>
> +Date: Mon, 24 Dec 2018 11:03:58 +0800
> +Subject: [PATCH] src/fccache.c: Fix define for HAVE_POSIX_FADVISE
> +
> +Otherwise, there would be build errors in the following 2 cases:
> +* define HAVE_POSIX_FADVISE
> +Or:
> +* undef HAVE_POSIX_FADVISE
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
> +---
> + fccache.c |    2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/fccache.c b/src/fccache.c
> +index 6f3c68a..85cc4b4 100644
> +--- a/src/fccache.c
> ++++ b/src/fccache.c
> +@@ -700,7 +700,7 @@ FcDirCacheMapFd (FcConfig *config, int fd, struct stat *fd_stat, struct stat *di
> +     {
> + #if defined(HAVE_MMAP) || defined(__CYGWIN__)
> +       cache = mmap (0, fd_stat->st_size, PROT_READ, MAP_SHARED, fd, 0);
> +-#if (HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED)
> ++#if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED)
> +       posix_fadvise (fd, 0, fd_stat->st_size, POSIX_FADV_WILLNEED);
> + #endif
> +       if (cache == MAP_FAILED)
> +--
> +2.7.4
> +
> diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
> index 6128d5e..beeae7f 100644
> --- a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
> +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
> @@ -23,6 +23,7 @@ DEPENDS = "expat freetype zlib gperf-native"
>  SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
>             file://revert-static-pkgconfig.patch \
>             file://0001-src-fcxml.c-avoid-double-free-of-filename.patch \
> +           file://0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch \
>             "
>
>  SRC_URI[md5sum] = "00e748c67fad11e7057a71ed385e8bdb"
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core