[vlc-devel] [PATCH] contrib: bootstrap: Use python3

[Hugo Beauzée-Luyssen]

On Wed, Jul 3, 2019, at 7:34 AM, Steve Lhomme wrote:
> I made sure it works with python 2 and 3. What problem would this solve ?
> 

Some distributions don't provide a python -> python3 symbolic link by default (to be more specific, in this case the distribution is ubuntu bionic, which we use to build snap. I updated the image to include the python -> python3 link, but the recent images don't work with jenkins)
https://jenkins.videolan.org/job/vlc-nightly/job/vlc-nightly-snap/lastFailedBuild/console

> (note: meson needs python3 so already require it anyway, so I'd be OK 
> with this change)
> 
> On 2019-07-02 11:12, Hugo Beauzée-Luyssen wrote:
> > ---
> >   contrib/bootstrap | 4 ++--
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/contrib/bootstrap b/contrib/bootstrap
> > index 5e3f266932..1f9079fd73 100755
> > --- a/contrib/bootstrap
> > +++ b/contrib/bootstrap
> > @@ -379,9 +379,9 @@ esac
> >   BOOTSTRAP_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
> >   CURRENT_PATH="$( pwd -P )"
> >   # location of the contrib/src folder from the root of the contrib build folder
> > -TOPSRC=$(python -c "import os; print(os.path.relpath('$BOOTSTRAP_PATH', '$CURRENT_PATH'))")
> > +TOPSRC=$(python3 -c "import os; print(os.path.relpath('$BOOTSTRAP_PATH', '$CURRENT_PATH'))")
> >   # location of the contrib/src folder from a built library folder
> > -TOPSRC_BUILT=$(python -c "import os; print(os.path.relpath('$BOOTSTRAP_PATH', '$CURRENT_PATH/libfoo'))")
> > +TOPSRC_BUILT=$(python3 -c "import os; print(os.path.relpath('$BOOTSTRAP_PATH', '$CURRENT_PATH/libfoo'))")
> >   add_make "TOPSRC = $TOPSRC"
> >   add_make "TOPSRC_BUILT = $TOPSRC_BUILT"
> >   add_make "TOPDST = .."
> > -- 
> > 2.20.1
> > 
> > _______________________________________________
> > vlc-devel mailing list
> > To unsubscribe or modify your subscription options:
> > https://mailman.videolan.org/listinfo/vlc-devel
> > 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel

-- 
  Hugo Beauzée-Luyssen
  hugo at beauzee.fr