diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2011-10-18 00:09:20 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-30 16:38:02 +0000 |
commit | 071d5de3f358a654e45e4aa0f5fe8086aff39539 (patch) | |
tree | 313561ea51ad965034ba09d98de63b48c446f567 | |
parent | 1fa324c5332998a6ab353e05f8f0fae68f47a921 (diff) | |
download | poky-071d5de3f358a654e45e4aa0f5fe8086aff39539.tar.gz |
fontconfig: fix fix-pkgconfig.patch
* missing $ is causing problems ie when building webkit-efl
* see http://lists.linuxtogo.org/pipermail/openembedded-core/2011-June/003798.html
for details
(From OE-Core rev: e31dd9b65f3b03f79cabab25eca157532de3bd9c)
(From OE-Core rev: 5deaf85c0c07105173e6791a7aafd03aa5b2e204)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch b/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch index c8a3bf5d17..30415fce76 100644 --- a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch +++ b/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch | |||
@@ -11,5 +11,5 @@ Upstream-Status: Inappropriate [configuration] | |||
11 | Version: @VERSION@ | 11 | Version: @VERSION@ |
12 | Libs: -L${libdir} -lfontconfig | 12 | Libs: -L${libdir} -lfontconfig |
13 | -Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ | 13 | -Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ |
14 | +Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ -L{libdir} -lfreetype @ICONV_LIBS@ | 14 | +Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ -L${libdir} -lfreetype @ICONV_LIBS@ |
15 | Cflags: -I${includedir} | 15 | Cflags: -I${includedir} |
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb index 5381065256..55c04cc909 100644 --- a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb | |||
@@ -20,7 +20,7 @@ SECTION = "libs" | |||
20 | 20 | ||
21 | DEPENDS = "expat freetype zlib" | 21 | DEPENDS = "expat freetype zlib" |
22 | 22 | ||
23 | PR = "r3" | 23 | PR = "r4" |
24 | 24 | ||
25 | SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ | 25 | SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ |
26 | file://fix-pkgconfig.patch \ | 26 | file://fix-pkgconfig.patch \ |