diff options
| author | Xu Li <xu.li@intel.com> | 2008-11-11 20:15:17 +0800 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-12-01 17:57:55 +0000 |
| commit | d12f673a233042db37d77b811c87bc6854b4283b (patch) | |
| tree | 034b894338c5801990708fa058053dcc6449c5b5 /meta | |
| parent | ba601403fe524652b4a9658d375d4729d922bbda (diff) | |
| download | poky-d12f673a233042db37d77b811c87bc6854b4283b.tar.gz | |
upgrade cairo to 1.8.2; add patch to fix its libtool issue
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/cairo/cairo-1.8.2/hardcoded_libtool.patch | 17 | ||||
| -rw-r--r-- | meta/packages/cairo/cairo_1.8.2.bb | 6 |
2 files changed, 23 insertions, 0 deletions
diff --git a/meta/packages/cairo/cairo-1.8.2/hardcoded_libtool.patch b/meta/packages/cairo/cairo-1.8.2/hardcoded_libtool.patch new file mode 100644 index 0000000000..afdf2c8f08 --- /dev/null +++ b/meta/packages/cairo/cairo-1.8.2/hardcoded_libtool.patch | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | Index: cairo-1.8.2/build/aclocal.dolt.m4 | ||
| 2 | =================================================================== | ||
| 3 | --- cairo-1.8.2.orig/build/aclocal.dolt.m4 | ||
| 4 | +++ cairo-1.8.2/build/aclocal.dolt.m4 | ||
| 5 | @@ -163,7 +163,11 @@ done | ||
| 6 | if $modeok && $tagok ; then | ||
| 7 | . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}" | ||
| 8 | else | ||
| 9 | - exec ${top_builddir_slash}libtool "$[]@" | ||
| 10 | +__DOLTLIBTOOL__EOF__ | ||
| 11 | + | ||
| 12 | +echo ' exec ${top_builddir_slash}'${host_alias}-libtool' "$[]@"' >> doltlibtool | ||
| 13 | + | ||
| 14 | + cat << '__DOLTLIBTOOL__EOF__' >> doltlibtool | ||
| 15 | fi | ||
| 16 | __DOLTLIBTOOL__EOF__ | ||
| 17 | |||
diff --git a/meta/packages/cairo/cairo_1.8.2.bb b/meta/packages/cairo/cairo_1.8.2.bb new file mode 100644 index 0000000000..fd8a99b49e --- /dev/null +++ b/meta/packages/cairo/cairo_1.8.2.bb | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | require cairo.inc | ||
| 2 | |||
| 3 | PR = "r1" | ||
| 4 | |||
| 5 | SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ | ||
| 6 | file://hardcoded_libtool.patch;patch=1" | ||