cairo 1.8.8: fix libtool name in doltlibtool

In OE libtool is renamed to ${host_alias}-libtool. Change doltlibtool
script accordingly.

Ripped from patch for xserver-xorg 1.6.1
(c10e9906a2ecea7e9c04bf967a8882d6b4cd1077)

Signed-off-by: Michael Smith <msmith@cbnco.com>
Signed-off-by: Koen Kooi <koen@openembedded.org>

diff --git a/recipes/cairo/cairo_1.8.8.bb b/recipes/cairo/cairo_1.8.8.bb
index b2d8e65..74671fb 100644 (file)
--- a/recipes/cairo/cairo_1.8.8.bb
+++ b/recipes/cairo/cairo_1.8.8.bb
@@ -1,6 +1,9 @@
+PR = "r1"
+
 require cairo.inc
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
+           file://dolt-fix.patch;patch=1 \
           "
 
 

diff --git a/recipes/cairo/files/dolt-fix.patch b/recipes/cairo/files/dolt-fix.patch
new file mode 100644 (file)
index 0000000..16aff34
--- /dev/null
+++ b/recipes/cairo/files/dolt-fix.patch
@@ -0,0 +1,20 @@
+--- cairo-1.8.8/build/aclocal.dolt.m4.orig     2008-12-12 07:48:04.000000000 -0500
++++ cairo-1.8.8/build/aclocal.dolt.m4  2009-10-22 14:36:17.000000000 -0400
+@@ -147,7 +147,7 @@
+     cat <<__DOLTLIBTOOL__EOF__ > doltlibtool
+ #!$DOLT_BASH
+ __DOLTLIBTOOL__EOF__
+-    cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool
++    cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool
+ top_builddir_slash="${0%%doltlibtool}"
+ : ${top_builddir_slash:=./}
+ args=()
+@@ -163,7 +163,7 @@
+ if $modeok && $tagok ; then
+     . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
+ else
+-    exec ${top_builddir_slash}libtool "$[]@"
++    exec ${top_builddir_slash}@host_alias@-libtool "$[]@"
+ fi
+ __DOLTLIBTOOL__EOF__
+