[vlc-devel] [PATCH 7/7] contrib: allow building contribs out of the source tree

[Rémi Denis-Courmont]

Err, does this not force the use of absolute paths. If so, that's annoying.

I'm not sure what the point is. I'd rather use the same contribs for all build subdirs, than have to rebuild contribs for each of them.

Le 5 mars 2019 15:31:07 GMT+02:00, Steve Lhomme <robux4 at ycbcr.xyz> a écrit :
>The resulting contrib can be used via --with-contrib in the configure
>script.
>
>The local Makefile to build contribs is now specific to the build
>folder.
>---
> contrib/bootstrap | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
>diff --git a/contrib/bootstrap b/contrib/bootstrap
>index d7f92c30e3..7113c0f448 100755
>--- a/contrib/bootstrap
>+++ b/contrib/bootstrap
>@@ -50,12 +50,6 @@ GNUV3="1"
> AD_CLAUSES=
> WITH_OPTIMIZATION="1"
> 
>-if test ! -f "../../contrib/src/main.mak"
>-then
>-	echo "$0 must be run from a subdirectory"
>-	exit 1
>-fi
>-
> while test -n "$1"
> do
> 	case "$1" in
>@@ -381,9 +375,10 @@ esac
> #
> # Results output
> #
>-echo TOPSRC = .. >> Makefile
>+BOOTSTRAP_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
>+echo TOPSRC = $BOOTSTRAP_PATH >> Makefile
> echo TOPDST = . >> Makefile
> echo include $\(TOPSRC\)/src/main.mak >> Makefile
> echo "Bootstrap completed."
> make help
>-mkdir -p ../../contrib/tarballs || exit $?
>+mkdir -p $BOOTSTRAP_PATH/tarballs || exit $?
>-- 
>2.17.1
>
>_______________________________________________
>vlc-devel mailing list
>To unsubscribe or modify your subscription options:
>https://mailman.videolan.org/listinfo/vlc-devel

-- 
Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20190305/5ccec7cb/attachment.html>