summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2009-07-15 12:32:33 +0400
committerDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2009-07-15 12:41:10 +0400
commitc10e9906a2ecea7e9c04bf967a8882d6b4cd1077 (patch)
treea7bced9063641f771d510354674a1b5a726aef16
parenta41c726ede88bd70b0428481819097489d728bf3 (diff)
xserver-xorg-1.6.1: fix libtool name in doltlibtool
In OE cross-libtool is renamed. Change doltlibtool script in xserver-xorg accordingly. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-rw-r--r--recipes/xorg-xserver/xserver-xorg/dolt-fix.patch22
-rw-r--r--recipes/xorg-xserver/xserver-xorg_1.6.1.bb3
2 files changed, 24 insertions, 1 deletions
diff --git a/recipes/xorg-xserver/xserver-xorg/dolt-fix.patch b/recipes/xorg-xserver/xserver-xorg/dolt-fix.patch
new file mode 100644
index 0000000000..9e15f42e84
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg/dolt-fix.patch
@@ -0,0 +1,22 @@
+Index: xorg-server-1.6.1/acinclude.m4
+===================================================================
+--- xorg-server-1.6.1.orig/acinclude.m4 2009-04-14 21:14:56.000000000 +0400
++++ xorg-server-1.6.1/acinclude.m4 2009-07-15 12:38:33.796848843 +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__
+
diff --git a/recipes/xorg-xserver/xserver-xorg_1.6.1.bb b/recipes/xorg-xserver/xserver-xorg_1.6.1.bb
index a177b19e6a..d8379eb396 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.6.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.6.1.bb
@@ -6,7 +6,8 @@ RDEPENDS += "hal"
PE = "2"
PR = "r1"
-SRC_URI += "file://sysroot_fix.patch;patch=1"
+SRC_URI += "file://sysroot_fix.patch;patch=1 \
+ file://dolt-fix.patch;patch=1"
MESA_VER = "7.2"