[vlc-devel] [PATCH] Configure: find LUAC in srcdir/bin, rather than in contrib dir. If contribs were built using a prefix, ${CONTRIB_DIR} will point to that prefix and ${CONTRIB_DIR}/../bin will be an invalid location where to find luac.

[jeremy.vignelles at dev3i.fr]

Hi,
Thanks for your review.

My issue is that I am cross-compiling vlc for windows and at the same time installing the contribs in the /build-tools folder

Contribs are built with :
../bootstrap --host=$HOST_COMPILER --prefix="$BUILD_TOOLS_PATH"
  make -j8 fetch
  make -j4

and vlc is configured with

--with-contrib=$BUILD_TOOLS_PATH

With this option, the configure script sets ${CONTRIB_DIR} is set to /build-tools.
In my case, luac Is still installed under /vlc/contrib/bin, but the configure script is assuming luac to be found under /build-tools/../bin/, which is wrong.

Since LUAC is always installed under the $srcdir/contrib/bin/ folder, I suppose this is a better choice to do it like that rather than being based on $CONTRIB_DIR.

I agree that ` cd ${srcdir} && pwd` feels hackish, but I couldn't find another way to do that. Suggestions are welcomed 😊


-----Message d'origine-----
De : Rémi Denis-Courmont [mailto:remi at remlab.net] 
Envoyé : mardi 9 janvier 2018 12:39
À : vlc-devel at videolan.org
Cc : Jeremy Vignelles <jeremy.vignelles at dev3i.fr>
Objet : Re: [vlc-devel] [PATCH] Configure: find LUAC in srcdir/bin, rather than in contrib dir. If contribs were built using a prefix, ${CONTRIB_DIR} will point to that prefix and ${CONTRIB_DIR}/../bin will be an invalid location where to find luac.

On lundi 8 janvier 2018 16:07:12 EET Jeremy Vignelles wrote:
> ---
>  configure.ac | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac index 030832e..e4e9c74 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -440,8 +440,8 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
>      ])
> 
>      dnl Newer contribs follow usual name space rules
> -    AS_IF([test -x
> "${CONTRIB_DIR}/../bin/${host_alias}-luac${BUILDEXEEXT}"], [ -     
> LUAC="${CONTRIB_DIR}/../bin/${host_alias}-luac${BUILDEXEEXT}" +   
> AS_IF([test -x 
> "${srcdir}/contrib/bin/${host_alias}-luac${BUILDEXEEXT}"], [
> +      LUAC="`cd ${srcdir} &&
> pwd`/contrib/bin/${host_alias}-luac${BUILDEXEEXT}" ])
>    ])

Nack. This patch assumes native buiild.

../bin is the correct path to contrib-built build tools.

--
Rémi Denis-Courmont