diff options
| author | Raymond Danks <raymond@edanks.com> | 2006-04-18 01:28:51 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-18 01:28:51 +0000 |
| commit | d4cf4c1565049d53009ea27f378589293f251f6d (patch) | |
| tree | 15ebb565c9d73715af1020c862f08cfe7f1b7cea | |
| parent | 49fca2d04df1029b9d5db30691ea670ae2db4d2c (diff) | |
fontconfig: Work around archive created with patched files read-only.
* Fontconfig-native should use freetype-config-native if it exists; not freetype-config which is for non-native packages.
| -rw-r--r-- | packages/fontconfig/fontconfig-native_2.2.95.bb | 1 | ||||
| -rw-r--r-- | packages/fontconfig/fontconfig_2.2.95.bb | 14 |
2 files changed, 14 insertions, 1 deletions
diff --git a/packages/fontconfig/fontconfig-native_2.2.95.bb b/packages/fontconfig/fontconfig-native_2.2.95.bb index bc988e0ee2..b3d267b798 100644 --- a/packages/fontconfig/fontconfig-native_2.2.95.bb +++ b/packages/fontconfig/fontconfig-native_2.2.95.bb @@ -6,6 +6,7 @@ DEPENDS = "freetype-native expat-native zlib-native" 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-native' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1))]}" do_stage () { oe_runmake install diff --git a/packages/fontconfig/fontconfig_2.2.95.bb b/packages/fontconfig/fontconfig_2.2.95.bb index 841922206c..7ff731ebe8 100644 --- a/packages/fontconfig/fontconfig_2.2.95.bb +++ b/packages/fontconfig/fontconfig_2.2.95.bb @@ -8,7 +8,7 @@ SRC_URI = "http://freedesktop.org/fontconfig/release/fontconfig-${PV}.tar.gz \ file://fc-lang.patch;patch=1" PR = "r6" -PACKAGES =+ "fontconfig-utils" +PACKAGES =+ "fontconfig-utils " FILES_fontconfig-utils = "${bindir}/*" # Work around past breakage in debian.bbclass @@ -26,6 +26,18 @@ export HASDOCBOOK="no" EXTRA_OECONF = " --disable-docs " 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) +} + do_stage () { oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/fontconfig |