| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Revert part of http://cgit.freedesktop.org/fontconfig/commit/fontconfig.pc.in?id=338ffe6b886ad4ba86ff471cb59c4a5e5ffbe408 |
| 2 | 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 |
| 3 | paths into -I options into fontconfig.pc which is them prepended with sysroot when read back by cross pkg-config and |
| 4 | we end up with -I <sysroot>/<sysroot>/usr/include/fontconfig in CFLAGS of clients which depend on it. one such example |
| 5 | is matchbox-panel-2 and it was working fine with gcc < 5 because it tolerated non-existing paths in -I flags but gcc-5 |
| 6 | gently refuses and rightly so. |
| 7 | |
| 8 | Upstream-Status: Inappropriate [OE-Specific] |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | |
| 11 | Index: fontconfig-2.11.93/fontconfig.pc.in |
| 12 | =================================================================== |
| 13 | --- fontconfig-2.11.93.orig/fontconfig.pc.in |
| 14 | +++ fontconfig-2.11.93/fontconfig.pc.in |
| 15 | @@ -15,4 +15,4 @@ Requires: @PKGCONFIG_REQUIRES@ |
| 16 | Requires.private: @PKGCONFIG_REQUIRES_PRIVATELY@ |
| 17 | Libs: -L${libdir} -lfontconfig |
| 18 | Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ @LIBXML2_LIBS@ |
| 19 | -Cflags: -I${includedir} @EXPAT_CFLAGS@ @FREETYPE_CFLAGS@ @ICONV_CFLAGS@ @LIBXML2_CFLAGS@ |
| 20 | +Cflags: -I${includedir} |