diff options
| author | Khem Raj <raj.khem@gmail.com> | 2016-12-14 16:06:08 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-17 09:57:03 +0000 |
| commit | 0c263ea07f3922bd91f183b0088593e5180c0720 (patch) | |
| tree | 5ed20dfd3612a304df77edb7619a3b404e2da08c /meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb | |
| parent | 76eb1c715e4b5515480e313d7517f0b814123cfa (diff) | |
| download | poky-0c263ea07f3922bd91f183b0088593e5180c0720.tar.gz | |
fontconfig: Fix namespace conflicts with glibc
glibc 2.25 will come with TS 18661-1 macro definitions in limits.h which ends with following errors
| ../../fontconfig-2.12.1/src/fcmatch.c:324:63: error: 'PRI_CHAR_WIDTH_STRONG' undeclared here (not in a function)
| #define FC_OBJECT(NAME, Type, Cmp) { FC_##NAME##_OBJECT, Cmp, PRI_##NAME##_STRONG, PRI_##NAME##_WEAK },
| ^
| ../../fontconfig-2.12.1/src/fcobjs.h:54:1: note: in expansion of macro 'FC_OBJECT'
| FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL)
| ^~~~~~~~~
| ../../fontconfig-2.12.1/src/fcmatch.c:324:84: error: 'PRI_CHAR_WIDTH_WEAK' undeclared here (not in a function)
| #define FC_OBJECT(NAME, Type, Cmp) { FC_##NAME##_OBJECT, Cmp, PRI_##NAME##_STRONG, PRI_##NAME##_WEAK },
| ^
| ../../fontconfig-2.12.1/src/fcobjs.h:54:1: note: in expansion of macro 'FC_OBJECT'
| FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL)
| ^~~~~~~~~
| make[3]: *** [Makefile:632: fcmatch.lo] Error 1
(From OE-Core rev: 3575826752e7140da493c7f560fb5fcf483fc9b4)
(From OE-Core rev: 7687234ff0f36ae943ca17624da9cdd8da0da83b)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb')
| -rw-r--r-- | meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb index 115f558eef..8616154c61 100644 --- a/meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb | |||
| @@ -22,6 +22,7 @@ DEPENDS = "expat freetype zlib" | |||
| 22 | 22 | ||
| 23 | SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ | 23 | SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ |
| 24 | file://revert-static-pkgconfig.patch \ | 24 | file://revert-static-pkgconfig.patch \ |
| 25 | file://0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch \ | ||
| 25 | " | 26 | " |
| 26 | SRC_URI[md5sum] = "ce55e525c37147eee14cc2de6cc09f6c" | 27 | SRC_URI[md5sum] = "ce55e525c37147eee14cc2de6cc09f6c" |
| 27 | SRC_URI[sha256sum] = "a9f42d03949f948a3a4f762287dbc16e53a927c91a07ee64207ebd90a9e5e292" | 28 | SRC_URI[sha256sum] = "a9f42d03949f948a3a4f762287dbc16e53a927c91a07ee64207ebd90a9e5e292" |