[Mesa-dev] [PATCH 1/2] Revert "configure: Fix --enable-XX-bit flags by moving LT_INIT where it should"

[Brian Paul]

On 08/13/2014 11:18 AM, Emil Velikov wrote:
> This reverts commit 2af28040d639dddbb7c258981a00eaf3dfcbcf03.
>
> The commit was resolving an issue where libtool will not setup the
> environment correctly when one explicitly provides --enable-{32,64}-bit
> at configure time. It was caused due to the "-m32,64" C{,XX}FLAGS being
> set too late relative to LT_INIT.
>
> At the same time this cases the enable_static to be incorrectly set,
> amongst others leading to build issues. Rather than being smart and
> trying to handle 32/64 bit build ourselves it may be better to delegate
> it to the builder/maintainer. The latter should now know better which is
> the correct(most appropriate) method.
>
> Bugzilla: https://urldefense.proofpoint.com/v1/url?u=https://bugs.freedesktop.org/show_bug.cgi?id%3D82536&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=lGQMzzTgII0I7jefp2FHq7WtZ%2BTLs8wadB%2BiIj9xpBY%3D%0A&m=2rJADKBBw7CAwlUx1lK5uOXm%2FpoMgAhVfQ0TXYag1c0%3D%0A&s=be1649d30d36b4e67d923d38dd39518152737ca8cb96a2344c2c33aed1c054a5
> Bugzilla: https://urldefense.proofpoint.com/v1/url?u=https://bugs.freedesktop.org/show_bug.cgi?id%3D82546&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=lGQMzzTgII0I7jefp2FHq7WtZ%2BTLs8wadB%2BiIj9xpBY%3D%0A&m=2rJADKBBw7CAwlUx1lK5uOXm%2FpoMgAhVfQ0TXYag1c0%3D%0A&s=03a9001a12b03ee473597e26f113b615695a122cfceeb3f91e7065f9bed51325
> ---
>   configure.ac | 11 +++--------
>   1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 4ff87eb..f678fa3 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -57,6 +57,9 @@ AC_CHECK_PROGS([PYTHON2], [python2 python])
>   AC_PROG_SED
>   AC_PROG_MKDIR_P
>
> +LT_PREREQ([2.2])
> +LT_INIT([disable-static])
> +
>   AX_PROG_BISON([],
>                 AS_IF([test ! -f "$srcdir/src/glsl/glcpp/glcpp-parse.c"],
>                       [AC_MSG_ERROR([bison not found - unable to compile glcpp-parse.y])]))
> @@ -2190,14 +2193,6 @@ dnl Add user CFLAGS and CXXFLAGS
>   CFLAGS="$CFLAGS $USER_CFLAGS"
>   CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
>
> -dnl
> -dnl LT_INIT adds tests to determine host based on some variables like (AM_)C(XX)FLAGS and (AM_)LDFLAGS.
> -dnl They need to be set before calling LT_INIT so the macro can configure things correctly when cross_compiling.
> -dnl This will allow --enable-xx-bit to work as expected.
> -dnl
> -LT_PREREQ([2.2])
> -LT_INIT([disable-static])
> -
>   dnl Substitute the config
>   AC_CONFIG_FILES([Makefile
>   		src/Makefile
>

This patch also broke the mechanism that copies the libGL.so libs, etc 
into the top-level lib/ and lib/gallium/ directories.  Reverting the 
patch fixes that.

Reviewed-by: Brian Paul <brianp at vmware.com>
Tested-by: Brian Paul <brianp at vmware.com>