sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Ross Burton 2013-02-11 16:03:09 +00:00 committed by Richard Purdie
parent 8c22531e49
commit 556217d482
2 changed files with 3 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
meta/recipes-graphics/fontconfig/fontconfig-2.10.2/fix-pkgconfig.patch
View File

@ -1,15 +0,0 @@
Upstream-Status: Inappropriate [configuration]
---
fontconfig.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- fontconfig-2.9.0.orig/fontconfig.pc.in
+++ fontconfig-2.9.0/fontconfig.pc.in
@@ -7,5 +7,5 @@
Description: Font configuration and customization library
Version: @VERSION@
Libs: -L${libdir} -lfontconfig
-Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@
+Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ -L${libdir} -lfreetype @ICONV_LIBS@
Cflags: -I${includedir}

47
meta/recipes-graphics/fontconfig/fontconfig_2.10.2.bb
View File

@ -24,16 +24,14 @@ PR = "r1"
SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
file://Add-sysroot-option-to-fc-cache-and-fc-cat.patch \
file://fix-pkgconfig.patch \
"
SRC_URI[md5sum] = "025e08b3d7fe45c433de5718e441ed15"
SRC_URI[sha256sum] = "5c3bf994bb6d6303bbf1e641eaa4b431932138dc90de33642e5845e31e1fdfd6"
PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
FILES_fontconfig-utils = "${bindir}/*"
PACKAGES =+ "fontconfig-utils"
FILES_${PN} =+ "${datadir}/xml/*"
FILES_fontconfig-utils = "${bindir}/*"
# Work around past breakage in debian.bbclass
RPROVIDES_fontconfig-utils = "libfontconfig-utils"
@ -41,45 +39,6 @@ RREPLACES_fontconfig-utils = "libfontconfig-utils"
RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
DEBIAN_NOAUTONAME_fontconfig-utils = "1"
PARALLEL_MAKE = ""
inherit autotools pkgconfig
export HASDOCBOOK="no"
EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH} --with-default-fonts=${datadir}/fonts"
EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
# The tarball has some of the patched files as read only, which
# patch doesn't like at all
fontconfig_do_unpack() {
chmod -R u+rw ${S}
}
python do_unpack () {
bb.build.exec_func('base_do_unpack', d)
bb.build.exec_func('fontconfig_do_unpack', d)
}
BUILD_CFLAGS += " -I${STAGING_INCDIR}/freetype2"
do_configure_append () {
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile
sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile
}
EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts"