summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-02-11 16:03:09 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-11 22:48:50 +0000
commit556217d48249bf63f82ab1529ab115a3b7aa6da0 (patch)
tree934c1cdd35e7b65b102095ce52e731037f0aeca6
parent8c22531e491e6b0cfffaaa80d6bc75db757fc1d1 (diff)
downloadpoky-556217d48249bf63f82ab1529ab115a3b7aa6da0.tar.gz
fontconfig: remove unexplainable and broken build tweaking
The build flag twiddling in do_configure_append was unexplainable and clearly wrong (native flags for a cross build), remove it all. Parallel make appears to be working now, so enable it. The tarball doesn't contain read only sources, remove the unpack hacking. The pkgconfig doesn't need patching as the freetype link lines are the same. Don't need to specify where freetype is, it's found automatically. Merge fontconfig-util-dbg into fontconfig-dbg. Don't export HASDOCBOOK, --disable-docs is sufficient to turn off documentation building. (From OE-Core rev: ba3db5f5e7055d597b21d8b5f8e60bc3c4f12bd2) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig-2.10.2/fix-pkgconfig.patch15
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig_2.10.2.bb47
2 files changed, 3 insertions, 59 deletions
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.10.2/fix-pkgconfig.patch b/meta/recipes-graphics/fontconfig/fontconfig-2.10.2/fix-pkgconfig.patch
deleted file mode 100644
index 6be04a1509..0000000000
--- a/meta/recipes-graphics/fontconfig/fontconfig-2.10.2/fix-pkgconfig.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 fontconfig.pc.in | 2 +-
5 1 file changed, 1 insertion(+), 1 deletion(-)
6
7--- fontconfig-2.9.0.orig/fontconfig.pc.in
8+++ fontconfig-2.9.0/fontconfig.pc.in
9@@ -7,5 +7,5 @@
10 Description: Font configuration and customization library
11 Version: @VERSION@
12 Libs: -L${libdir} -lfontconfig
13-Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@
14+Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ -L${libdir} -lfreetype @ICONV_LIBS@
15 Cflags: -I${includedir}
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.10.2.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.10.2.bb
index 607cf9e6da..6f2456d071 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.10.2.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.10.2.bb
@@ -24,16 +24,14 @@ PR = "r1"
24 24
25SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ 25SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
26 file://Add-sysroot-option-to-fc-cache-and-fc-cat.patch \ 26 file://Add-sysroot-option-to-fc-cache-and-fc-cat.patch \
27 file://fix-pkgconfig.patch \
28 " 27 "
29 28
30SRC_URI[md5sum] = "025e08b3d7fe45c433de5718e441ed15" 29SRC_URI[md5sum] = "025e08b3d7fe45c433de5718e441ed15"
31SRC_URI[sha256sum] = "5c3bf994bb6d6303bbf1e641eaa4b431932138dc90de33642e5845e31e1fdfd6" 30SRC_URI[sha256sum] = "5c3bf994bb6d6303bbf1e641eaa4b431932138dc90de33642e5845e31e1fdfd6"
32 31
33PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " 32PACKAGES =+ "fontconfig-utils"
34FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
35FILES_fontconfig-utils = "${bindir}/*"
36FILES_${PN} =+ "${datadir}/xml/*" 33FILES_${PN} =+ "${datadir}/xml/*"
34FILES_fontconfig-utils = "${bindir}/*"
37 35
38# Work around past breakage in debian.bbclass 36# Work around past breakage in debian.bbclass
39RPROVIDES_fontconfig-utils = "libfontconfig-utils" 37RPROVIDES_fontconfig-utils = "libfontconfig-utils"
@@ -41,45 +39,6 @@ RREPLACES_fontconfig-utils = "libfontconfig-utils"
41RCONFLICTS_fontconfig-utils = "libfontconfig-utils" 39RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
42DEBIAN_NOAUTONAME_fontconfig-utils = "1" 40DEBIAN_NOAUTONAME_fontconfig-utils = "1"
43 41
44PARALLEL_MAKE = ""
45
46inherit autotools pkgconfig 42inherit autotools pkgconfig
47 43
48export HASDOCBOOK="no" 44EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts"
49
50EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH} --with-default-fonts=${datadir}/fonts"
51EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
52
53# The tarball has some of the patched files as read only, which
54# patch doesn't like at all
55
56fontconfig_do_unpack() {
57 chmod -R u+rw ${S}
58}
59
60python do_unpack () {
61 bb.build.exec_func('base_do_unpack', d)
62 bb.build.exec_func('fontconfig_do_unpack', d)
63}
64
65BUILD_CFLAGS += " -I${STAGING_INCDIR}/freetype2"
66
67do_configure_append () {
68 sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
69 sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
70 sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
71
72 sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
73 sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
74 sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
75
76 sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
77 sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile
78 sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
79
80 sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
81 sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile
82 sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile
83
84}
85