mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-20 08:29:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

fontconfig: Fix pkgconfig file generation to not have absolute paths

Browse Source 
Fixes cross building dependent packages with gcc-5
e.g. matchbox-panel-2

Change-Id: I6290cfa4aac5d03a7200472d0c713b7ea84b99ac
(From OE-Core rev: 5b3831fa52a38640ec529d2ffb366c8fffce3a51)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2015-04-23 20:35:32 -07:00
committed by Richard Purdie
parent 7caffd2559
commit 09fab50b9b
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch Normal file
View File

@@ -0,0 +1,20 @@
Revert part of http://cgit.freedesktop.org/fontconfig/commit/fontconfig.pc.in?id=338ffe6b886ad4ba86ff471cb59c4a5e5ffbe408
We really dont do static linking so its not going to cause issues for us but as such this is harming us by adding absolute
paths into -I options into fontconfig.pc which is them prepended with sysroot when read back by cross pkg-config and
we end up with -I <sysroot>/<sysroot>/usr/include/fontconfig in CFLAGS of clients which depend on it. one such example
is matchbox-panel-2 and it was working fine with gcc < 5 because it tolerated non-existing paths in -I flags but gcc-5
gently refuses and rightly so.
Upstream-Status: Not-Submitted [OE-Specific]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: fontconfig-2.11.93/fontconfig.pc.in
===================================================================
--- fontconfig-2.11.93.orig/fontconfig.pc.in
+++ fontconfig-2.11.93/fontconfig.pc.in
@@ -15,4 +15,4 @@ Requires: @PKGCONFIG_REQUIRES@
Requires.private: @PKGCONFIG_REQUIRES_PRIVATELY@
Libs: -L${libdir} -lfontconfig
Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ @LIBXML2_LIBS@
-Cflags: -I${includedir} @EXPAT_CFLAGS@ @FREETYPE_CFLAGS@ @ICONV_CFLAGS@ @LIBXML2_CFLAGS@
+Cflags: -I${includedir}

1
meta/recipes-graphics/fontconfig/fontconfig_2.11.93.bb
View File

@@ -21,6 +21,7 @@ SECTION = "libs"
DEPENDS = "expat freetype zlib"
SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
file://revert-static-pkgconfig.patch \
"
SRC_URI[md5sum] = "622f94f0f74e40775ea72d7d5f17a36d"
SRC_URI[sha256sum] = "296b5e83189589e537992d65ff01e0cd74eba9a91eb16a6890ce942e3695c526"