Re: libx11 1.2 problems (dolt vs. libtool)

[Mario Domenech Goulart <mario@ossystems.com.br>]

[-- Attachment #1: Type: text/plain, Size: 2199 bytes --]

Hi folks

On Fri, 29 May 2009 08:38:10 +0200 Jeremy Lainé <jeremy.laine@bolloretelecom.eu> wrote:

> Since libx11 was upgraded to 1.2, my libx11 builds are failing with:
>
> | ../../../doltlibtool: line 17:
> /home/oebuilder/oe/build/tmp/work/ppce300c3-angstrom-linux/libx11-1_1.2-r0/libX11-1.2/modules/im/ximcp/../../../libtool:
> No such file or directory
> | ../../../doltlibtool: line 17: exec:
> /home/oebuilder/oe/build/tmp/work/ppce300c3-angstrom-linux/libx11-1_1.2-r0/libX11-1.2/modules/im/ximcp/../../../libtool:
> cannot execute: No suchfile or directory
>
> It would seem I am not the only one with this problem:
>
> http://tinderbox.openembedded.net/packages/libx11/
>
> The problem is that the "dolibtool" script (see
> http://dolt.freedesktop.org) is trying to invoke the "libtool" script
> which it assumes lives in the base directory. However in OE the
> libtool script is called ${HOST_SYS}-libtool, so it is not being
> found.

That's the behavior we observed here too.


> For now I am working around the problem with the following patch, but
> I suspect this is going to crop up in other packages sooner or later:
>
> diff --git a/recipes/xorg-lib/libx11_1.2.bb b/recipes/xorg-lib/libx11_1.2.bb
> index a3d000f..8415315 100644
> --- a/recipes/xorg-lib/libx11_1.2.bb
> +++ b/recipes/xorg-lib/libx11_1.2.bb
> @@ -13,6 +13,10 @@ SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
>
>  EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
>
> +do_configure_append() {
> +       ln -s ${HOST_SYS}-libtool libtool
> +}
> +
>  do_compile() {
>         (
>                 unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS

As Otavio mentioned, we faced this problem here, but our approach to
solve it was a little different (in terms of implementation).  We
actually fixed the acinclude.m4 file (the patch is attached).

I guess the right thing to do is to patch dolt.m4
(http://cgit.freedesktop.org/dolt/ -- from where libx11's and xserver's
acinclude.m4 are generated, I suppose).  We are working on a patch for
it (the fix is basically the same as for acinclude.m4).

Best wishes.
Mario

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: acinclude.m4.patch --]
[-- Type: text/x-diff, Size: 676 bytes --]

--- libX11-1.2/acinclude.m4.orig	2009-05-29 16:45:39.000000000 -0300
+++ libX11-1.2/acinclude.m4	2009-05-29 18:29:56.000000000 -0300
@@ -213,10 +213,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'