fontconfig: convert to new style staging

diff --git a/recipes/fontconfig/fontconfig_2.6.0.bb b/recipes/fontconfig/fontconfig_2.6.0.bb
index 10c9349..d670b2f 100644 (file)
--- a/recipes/fontconfig/fontconfig_2.6.0.bb
+++ b/recipes/fontconfig/fontconfig_2.6.0.bb
@@ -3,7 +3,7 @@ LICENSE = "BSD"
 DESCRIPTION = "A library for configuring and customizing font access."
 DEPENDS = "expat freetype zlib"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
            file://fix-pkgconfig.patch;patch=1"
@@ -41,12 +41,6 @@ python do_unpack () {
        bb.build.exec_func('fontconfig_do_unpack', d)
 }
 
-do_stage () {
-       oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
-       install -d ${STAGING_INCDIR}/fontconfig
-       for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
-}
-
 BUILD_CFLAGS += " -I${STAGING_INCDIR}/freetype2"
 
 do_configure_append () {

diff --git a/recipes/fontconfig/fontconfig_2.6.99.bb b/recipes/fontconfig/fontconfig_2.6.99.bb
index 1350230..6254b3e 100644 (file)
--- a/recipes/fontconfig/fontconfig_2.6.99.bb
+++ b/recipes/fontconfig/fontconfig_2.6.99.bb
@@ -10,7 +10,7 @@ SRCREV = "96194cc3fa484837bf41598ff3f3d09b97c8dba4"
 SRC_URI = "git://anongit.freedesktop.org/~behdad/fontconfig;protocol=git \
 "
 
-PR = "r1"
+PR = "r2"
 S = "${WORKDIR}/git"
 
 PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
@@ -25,8 +25,7 @@ DEBIAN_NOAUTONAME_fontconfig-utils = "1"
 
 PARALLEL_MAKE = ""
 
-inherit autotools_stage
-AUTOTOOLS_STAGE_PKGCONFIG = "1"
+inherit autotools
 
 export HASDOCBOOK="no"