diff options
| author | Koen Kooi <koen@openembedded.org> | 2010-03-27 11:22:36 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-03-27 11:22:36 +0100 |
| commit | 39a3b86f6ec46245bcaebfb7b8b4b5c22a5f12bf (patch) | |
| tree | 71a45c50c14cb2817018c525b8cfe70a15a6c661 /recipes | |
| parent | 9cad640a0c239963a0ebf07fbfdb82df77ea1150 (diff) | |
fontconfig: convert to new style staging
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/fontconfig/fontconfig_2.6.0.bb | 8 | ||||
| -rw-r--r-- | recipes/fontconfig/fontconfig_2.6.99.bb | 5 |
2 files changed, 3 insertions, 10 deletions
diff --git a/recipes/fontconfig/fontconfig_2.6.0.bb b/recipes/fontconfig/fontconfig_2.6.0.bb index 10c934918e..d670b2f1e6 100644 --- 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 13502309f2..6254b3ee9e 100644 --- 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" |