diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/fontconfig/fontconfig-2.10.2/fix-pkgconfig.patch | 15 | ||||
| -rw-r--r-- | meta/recipes-graphics/fontconfig/fontconfig_2.10.2.bb | 47 |
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 @@ -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} 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" 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" |