<html><head></head><body>Hi,<br><br>I don't think we should depend on Python, at least not until distros settle how it works post removal of Python 2.<br><br><div class="gmail_quote">Le 17 juin 2019 10:26:37 GMT+03:00, Steve Lhomme <robux4@ycbcr.xyz> a écrit :<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<pre class="k9mail">The resulting contrib can be used via --with-contrib in the configure script.<br><br>The local Makefile to build contribs is now specific to the build folder.<br><br>change_prefix.sh is called from a contrib sub folder so we must use SRC_BUILT.<hr> contrib/bootstrap | 20 ++++++++++----------<br> contrib/src/main.mak | 2 +-<br> 2 files changed, 11 insertions(+), 11 deletions(-)<br><br>diff --git a/contrib/bootstrap b/contrib/bootstrap<br>index 7ad8b33c67..eff9787465 100755<br>--- a/contrib/bootstrap<br>+++ b/contrib/bootstrap<br>@@ -52,12 +52,6 @@ AD_CLAUSES=<br> WITH_OPTIMIZATION="1"<br> ENABLE_PDB=<br> <br>-if test ! -f "../../contrib/src/main.mak"<br>-then<br>- echo "$0 must be run from a subdirectory"<br>- exit 1<br>-fi<br>-<br> while test -n "$1"<br> do<br> case "$1" in<br>@@ -382,10 +376,16 @@ esac<br> #<br> # Results output<br> #<br>-add_make "TOPSRC = .."<br>-add_make "TOPSRC_BUILT = ../.."<br>-add_make "TOPDST = .."<br>+BOOTSTRAP_PATH="$( cd "$(dirname "$0")" ; pwd -P )"<br>+CURRENT_PATH="$( pwd -P )"<br>+# location of the contrib/src folder from the root of the contrib build folder<br>+TOPSRC=$(python -c "import os; print(os.path.relpath('$BOOTSTRAP_PATH', '$CURRENT_PATH'))")<br>+# location of the contrib/src folder from a built library folder<br>+TOPSRC_BUILT=$(python -c "import os; print(os.path.relpath('$BOOTSTRAP_PATH', '$CURRENT_PATH/libfoo'))")<br>+add_make "TOPSRC = $TOPSRC"<br>+add_make "TOPSRC_BUILT = $TOPSRC_BUILT"<br>+add_make "TOPDST = ."<br> add_make 'include $(TOPSRC)/src/main.mak'<br> echo "Bootstrap completed."<br> make help<br>-mkdir -p ../../contrib/tarballs || exit $?<br>+mkdir -p $BOOTSTRAP_PATH/tarballs || exit $?<br>diff --git a/contrib/src/main.mak b/contrib/src/main.mak<br>index 9b9ebb33c4..58993ac44d 100644<br>--- a/contrib/src/main.mak<br>+++ b/contrib/src/main.mak<br>@@ -476,7 +476,7 @@ prebuilt: vlc-contrib-$(HOST)-latest.tar.bz2<br> $(RM) -r $(PREFIX)<br> -$(UNPACK)<br> mv -n $(HOST) $(TOPDST)<br>- cd $(PREFIX) && $(SRC)/change_prefix.sh<br>+ cd $(PREFIX) && $(SRC_BUILT)/change_prefix.sh<br> ifdef HAVE_WIN32<br> ifndef HAVE_CROSS_COMPILE<br> $(RM) `find $(PREFIX)/bin | file -f- | grep ELF | awk -F: '{print $$1}' | xargs`</pre></blockquote></div><br>-- <br>Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.</body></html>