[vlc-devel] [PATCH 7/7] contrib: allow building contribs out of the source tree
Steve Lhomme
robux4 at ycbcr.xyz
Tue Mar 5 16:36:02 CET 2019
On 3/5/2019 4:16 PM, Rémi Denis-Courmont wrote:
> Err, does this not force the use of absolute paths. If so, that's
> annoying.
Yes it does, although it might be possible to do without, now that all
pathes are relative to TOPSRC or TOPDST
>
> 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.
You can still do that. It's compatible with the way things worked before.
The reason, for me, is to have on out-of-tree folder per build target. I
have tons of targets with different versions and it's quickly a mess
when you have to mix them. Same thing when switching between 4.0 and
3.0. This could be out of tree for each and they never have to know each
other.
>
> 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 $?
>
>
> --
> Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez
> excuser ma brièveté.
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
More information about the vlc-devel
mailing list