[oe] [PATCH] xserver-xorg 1.6.1: fix dolt script to handle ${host_alias}
Michael Smith
msmith at cbnco.com
Sun Jul 12 21:59:09 UTC 2009
Signed-off-by: Michael Smith <msmith at cbnco.com>
---
.../xserver-xorg-1.6.1/dolt-host-alias.patch | 28 ++++++++++++++++++++
recipes/xorg-xserver/xserver-xorg_1.6.1.bb | 7 +++-
2 files changed, 33 insertions(+), 2 deletions(-)
create mode 100644 recipes/xorg-xserver/xserver-xorg-1.6.1/dolt-host-alias.patch
diff --git a/recipes/xorg-xserver/xserver-xorg-1.6.1/dolt-host-alias.patch b/recipes/xorg-xserver/xserver-xorg-1.6.1/dolt-host-alias.patch
new file mode 100644
index 0000000..ca2ca07
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.6.1/dolt-host-alias.patch
@@ -0,0 +1,28 @@
+upstream: http://lists.freedesktop.org/archives/xorg/2009-May/045835.html
+
+From: Mario Domenech Goulart <mario at ossystems.com.br>
+
+Generates the libtool file prefixed by ${host_alias} when it is set.
+This is required in cross compiling environments (such as OpenEmbedded).
+
+--- xorg-server-1.6.1/acinclude.m4.orig 2009-04-14 13:14:56.000000000 -0400
++++ xorg-server-1.6.1/acinclude.m4 2009-07-12 17:25:23.000000000 -0400
+@@ -163,10 +163,16 @@
+ if $modeok && $tagok ; then
+ . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
+ else
+- exec ${top_builddir_slash}libtool "$[]@"
+-fi
+ __DOLTLIBTOOL__EOF__
+
++maybe_hyphen=
++if ! test x$host_alias = x; then
++ maybe_hyphen="-"
++fi
++
++echo ' exec ${top_builddir_slash}'${host_alias}${maybe_hyphen}'libtool "$[]@"' >>doltlibtool
++echo 'fi' >>doltlibtool
++
+ dnl Done writing out doltlibtool; substitute it for libtool.
+ chmod +x doltlibtool
+ LIBTOOL='$(top_builddir)/doltlibtool'
diff --git a/recipes/xorg-xserver/xserver-xorg_1.6.1.bb b/recipes/xorg-xserver/xserver-xorg_1.6.1.bb
index a177b19..f2902cf 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.6.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.6.1.bb
@@ -4,9 +4,12 @@ DESCRIPTION = "the X.Org X server"
DEPENDS += "pixman libpciaccess openssl xineramaproto libxinerama"
RDEPENDS += "hal"
PE = "2"
-PR = "r1"
+PR = "r2"
-SRC_URI += "file://sysroot_fix.patch;patch=1"
+SRC_URI += " \
+ file://sysroot_fix.patch;patch=1 \
+ file://dolt-host-alias.patch;patch=1 \
+"
MESA_VER = "7.2"
--
1.6.3
More information about the Openembedded-devel
mailing list