diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-graphics/fontconfig | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-graphics/fontconfig')
-rw-r--r-- | poky/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch | 33 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb | 9 |
2 files changed, 41 insertions, 1 deletions
diff --git a/poky/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch b/poky/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch new file mode 100644 index 000000000..d9bce212f --- /dev/null +++ b/poky/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@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: Backport [https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/586e35450e9ca7c1dc647ceb9d75ac8ed08c5c16] + +Signed-off-by: Robert Yang <liezhi.yang@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/poky/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb b/poky/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb index cec524755..8fa739de2 100644 --- a/poky/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb +++ b/poky/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" @@ -41,6 +42,12 @@ do_install_append_class-target() { ln ${D}${bindir}/fc-cache ${D}${libexecdir}/${MLPREFIX}fc-cache } +do_install_append_class-nativesdk() { + # duplicate fc-cache for postinstall script + mkdir -p ${D}${libexecdir} + ln ${D}${bindir}/fc-cache ${D}${libexecdir}/${MLPREFIX}fc-cache +} + PACKAGES =+ "fontconfig-utils" FILES_${PN} =+ "${datadir}/xml/*" FILES_fontconfig-utils = "${bindir}/* ${libexecdir}/*" @@ -61,4 +68,4 @@ FONTCONFIG_FONT_DIRS ?= "no" EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts --with-cache-dir=${FONTCONFIG_CACHE_DIR} --with-add-fonts=${FONTCONFIG_FONT_DIRS}" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" |