fontconfig-native 2.6.0: convert to new style staging

diff --git a/recipes/fontconfig/fontconfig-native_2.6.0.bb b/recipes/fontconfig/fontconfig-native_2.6.0.bb
index 43cf020..fb9e002 100644 (file)
--- a/recipes/fontconfig/fontconfig-native_2.6.0.bb
+++ b/recipes/fontconfig/fontconfig-native_2.6.0.bb
@@ -8,11 +8,13 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
 EXTRA_OEMAKE = ""
 EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
 
-do_stage () {
-       oe_runmake install
-       install fc-lang/fc-lang ${STAGING_BINDIR}
-       install fc-glyphname/fc-glyphname ${STAGING_BINDIR}
+do_install_append () {
+       install -d ${D}${bindir}
+       install fc-lang/fc-lang ${D}${bindir}
+       install fc-glyphname/fc-glyphname ${D}${bindir}
 }
 
+NATIVE_INSTALL_WORKS = "1"
+
 SRC_URI[md5sum] = "ab54ec1d4ddd836313fdbc0cd5299d6d"
 SRC_URI[sha256sum] = "a9a639eaa0e5666606a4657cc1494eb6df820fac7e5a2aa0c3f7e703b7c8d8a5"

diff --git a/recipes/fontconfig/fontconfig_2.6.0.bb b/recipes/fontconfig/fontconfig_2.6.0.bb
index e1c9ced..fd46235 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 = "r3"
+PR = "r4"
 
 SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
            file://fix-pkgconfig.patch"