fontconfig: Fix define for HAVE_POSIX_FADVISE
PATCH 1/1 fontconfig: Fix define for HAVE_POSIX_FADVISE
In reply to Robert YangOtherwise, there would be build errors in the following 2 cases:
* define HAVE_POSIX_FADVISE
Or:
* undef HAVE_POSIX_FADVISE
--- ...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
meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch new file +33 -0
@@ -0,0 +1,33 @@ +From ab9522177a8396a51812fdbebb6387df451a8499 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +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 <[email protected]> +--- + 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 +
meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb +1 -0
@@ -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"
Signature · 1 line
2.7.4
cover fontconfig: Fix define for HAVE_POSIX_FADVISE
The following changes since commit a4edfa4cf451bf412525887b5b24b9db6486ae97:
remove unused distutils-tools.bbclass (2019-01-23 07:57:02 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/ft
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/ft
Robert Yang (1):
fontconfig: Fix define for HAVE_POSIX_FADVISE
...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
Signature · 1 line
2.7.4
Please send this upstream.
Ross
Quoted 72 lines · Robert Yang
Otherwise, there would be build errors in the following 2 cases:
* defineHAVE_POSIX_FADVISE
Or:
* undefHAVE_POSIX_FADVISESigned-off-by Robert Yang <[email protected]>--- ...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.patchmeta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch new file +33
-0@@ -0,0 +1,33 @@ +From ab9522177a8396a51812fdbebb6387df451a8499 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +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 <[email protected]> +--- + 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 +meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb +1
-1@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Hi Ross,
Quoted 1 line · Ross
Please send this upstream.
I tried a few times to subscribe [email protected], but it requires manual approval, I didn't receive the approval after about 1 month.
I tried it again just now, let's see what will happen.
// Robert
Quoted 77 lines
Ross
Quoted 72 lines · Robert Yang
Otherwise, there would be build errors in the following 2 cases:
* defineHAVE_POSIX_FADVISE
Or:
* undefHAVE_POSIX_FADVISESigned-off-by Robert Yang <[email protected]>--- ...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.patchmeta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch new file +33
-0@@ -0,0 +1,33 @@ +From ab9522177a8396a51812fdbebb6387df451a8499 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +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 <[email protected]> +--- + 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 +meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb +1
-1@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Quoted 9 lines · Robert Yang
Hi Ross,
Quoted 1 line · Ross
Please send this upstream.
I tried a few times to subscribe [email protected], but it requires manual approval, I didn't receive the approval after about 1 month.
I tried it again just now, let's see what will happen.
Strangely, it doesn't require manual approval now, so I subscribed it just now and sent the patch to upstream:
https://lists.freedesktop.org/archives/fontconfig/2019-January/thread.html
It is not in the archive yet.
// Robert
Quoted 85 lines
// Robert
Quoted 82 lines
Ross
Quoted 77 lines · Robert Yang
Otherwise, there would be build errors in the following 2 cases:
* defineHAVE_POSIX_FADVISE
Or:
* undefHAVE_POSIX_FADVISESigned-off-by Robert Yang <[email protected]>---
...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.patchmeta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch +0
-0new file mode 100644
index 0000000..07b2d65
---/dev/null
+++b/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patchmeta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch +22
-0@@ -0,0 +1,33 @@ +From ab9522177a8396a51812fdbebb6387df451a8499 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +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 <[email protected]> +--- + 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
+ {
+ #ifdefined(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)++#ifdefined(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.4meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch +1
-0+meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb +1
-0@@ -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"Signature · 7 lines
2.7.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
Quoted 11 lines · Robert Yang
Quoted 8 lines · Robert Yang
Hi Ross,
Quoted 1 line · Ross
Please send this upstream.
I tried a few times to subscribe [email protected], but it requires manual approval, I didn't receive the approval after about 1 month.
Quoted 8 lines
Quoted 1 line
I tried it again just now, let's see what will happen.
Strangely, it doesn't require manual approval now, so I subscribed it just now and sent the patch to upstream:
https://lists.freedesktop.org/archives/fontconfig/2019-January/thread.html
It is not in the archive yet.
BTW, it has been merged:
https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/586e35450e9ca7c1dc647ceb9d75ac8ed08c5c16
// Robert
Quoted 89 lines
// Robert
Quoted 86 lines
// Robert
Quoted 83 lines
Ross
Quoted 78 lines · Robert Yang
Otherwise, there would be build errors in the following 2 cases:
* defineHAVE_POSIX_FADVISE
Or:
* undefHAVE_POSIX_FADVISESigned-off-by Robert Yang <[email protected]>---
...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.patchmeta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch +0
-0new file mode 100644
index 0000000..07b2d65
---/dev/null
+++b/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patchmeta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch +22
-0@@ -0,0 +1,33 @@ +From ab9522177a8396a51812fdbebb6387df451a8499 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +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 <[email protected]> +--- + 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
+ {
+ #ifdefined(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)++#ifdefined(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.4meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch +1
-0+meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb +1
-0@@ -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"Signature · 7 lines
2.7.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core