Building xserver-xorg 1.6.1 for i686: libtool error
Hi,
On my x86_64 build box, xserver-xorg's configure is generating i686-oe-linux-libtool instead of libtool, but the doltlibtool script is still looking for plain old libtool.
I worked around it with a symlink.
Wondering if anyone has a pointer where I can look to solve it permanently. It looks like libtool.m4 is setting ofile=${host_alias}-libtool, but xserver-xorg's acinclude.m4 is "dolt, a replacement for libtool" and it doesn't have the same ideas about what libtool should be called.
Thanks,
Mike
../doltlibtool --tag=CC --mode=link i686-oe-linux-gcc -march=pentiumpro -DHAVE_DIX_CONFIG_H -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT -DDBUS_API_SUBJECT_TO_CHANGE
[blah blah blah]
-Wl,-O1 -Wl,--hash-style=gnu -ldl -o libdix.la atom.lo colormap.lo
[blah blah]
../doltlibtool: line 17: /home/michael/startitup/tmp/work/i686-oe-linux/xserver-xorg-2_1.6.1-r1/xorg-server-1.6.1/dix/../libtool: No such file or directory ../doltlibtool: line 17: exec: /home/michael/startitup/tmp/work/i686-oe-linux/xserver-xorg-2_1.6.1-r1/xorg-server-1.6.1/dix/../libtool: cannot execute: No such file or directory make[2]: *** [libdix.la] Error 126
$ cat doltlibtool
#!/bin/bash
top_builddir_slash="${0%%doltlibtool}"
: ${top_builddir_slash:=./}
args=()
modeok=false
tagok=false
for arg in "$@"; do
case "$arg" in
--mode=compile) modeok=true ;;
--tag=CC|--tag=CXX) tagok=true ;;
*) args[${#args[@]}]="$arg" ;;
esac
done
if $modeok && $tagok ; then
. ${top_builddir_slash}doltcompile "${args[@]}"
else
exec ${top_builddir_slash}libtool "$@"
fiHello Michael,
On Fri, Jul 10, 2009 at 3:31 PM, Michael Smith<[email protected]> wrote:
[...]
Quoted 6 lines
I worked around it with a symlink.
Wondering if anyone has a pointer where I can look to solve it permanently. It looks like libtool.m4 is setting ofile=${host_alias}-libtool, but xserver-xorg's acinclude.m4 is "dolt, a replacement for libtool" and it doesn't have the same ideas about what libtool should be called.
http://lists.freedesktop.org/archives/xorg/2009-May/045835.html
Above goes the patch we have sent for inclusion on dolt GIT. I'll pester upstream about it again ;-)
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Quoted 4 lines · Otavio Salvador
http://lists.freedesktop.org/archives/xorg/2009-May/045835.html
Above goes the patch we have sent for inclusion on dolt GIT. I'll pester upstream about it again ;-)
Thanks! In the meantime I'll update the 1.6.1 recipe to use your patch.
BTW, there's a separate dolt mailing list
(http://lists.freedesktop.org/mailman/listinfo/dolt). Maybe the dolt maintainer lurks there but not on xorg...
Mike
PATCH 1/1 xserver-xorg 1.6.1: fix dolt script to handle ${host_alias}
--- .../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
recipes/xorg-xserver/xserver-xorg-1.6.1/dolt-host-alias.patch new file +28 -0
@@ -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'
recipes/xorg-xserver/xserver-xorg_1.6.1.bb +5 -2
@@ -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"
Signature · 1 line
1.6.3