Ticket #8027: python_configure.patch

configure

@@ -301 +301 @@
   echo "  --with-bindings=LIST     install the bindings specified in the"
   echo "                           comma-separated list"
   echo "                           Supported bindings: perl, python"
+  echo "  --python-exec=PATH       Force a specific executable to use"
 <<BLOCK_QUOTE
   echo
   echo "Developer options (useful when working on FFmpeg itself):"
@@ -1263 +1264 @@
     runprefix
     shlibdir
     x11_path
+    python_exec
 '
 
 CMDLINE_SET="
@@ -1522 +1524 @@
 libdir_default='${prefix}/lib'
 mandir_default='${prefix}/share/man'
 shlibdir_default="$libdir_default"
+python_exec_default="python"
 
 libdir_name='lib'
 
@@ -1822 +1825 @@
             fi
         done
     ;;
+    --python-exec=*) python_exec=$optval
+    ;;
     --without-bindings=*)
         tmp_bindings=`echo ${optval} | sed -e 's/,/ /g'`
         for binding in ${tmp_bindings} ; do
@@ -3878 +3883 @@
 echo "# Bindings"
 echo "bindings_perl             ${bindings_perl-no}"
 echo "bindings_python           ${bindings_python-no}"
+echo "python_exec               ${python_exec-python}"
 echo ""
 
 MYTH_CONFIG_H=libs/libmythdb/mythconfig.h
@@ -3898 +3904 @@
 echo "SYSROOT=$sysroot" >> $MYTH_CONFIG_MAK
 echo "LIBDIRNAME=$libdir_name" >> $MYTH_CONFIG_MAK
 echo "LIBDIR=$libdir" >> $MYTH_CONFIG_MAK
+echo "PYTHON_EXEC=$python_exec" >> $MYTH_CONFIG_MAK
 <<BLOCK_QUOTE
 echo "SHLIBDIR=\$(DESTDIR)$shlibdir" >> config.mak
 echo "INCDIR=\$(DESTDIR)$incdir" >> config.mak
@@ -3907 +3914 @@
 echo "SRC_PATH=\"$source_path\"" >> config.mak
 echo "SRC_PATH_BARE=$source_path" >> config.mak
 echo "BUILD_ROOT=\"$PWD\"" >> config.mak
+echo "PYTHON_EXEC=\"$python_exec\"" >> config.mak
 echo "CC=$cc" >> config.mak
 echo "AS=$as" >> config.mak
 echo "YASM=$yasmexe" >> config.mak

bindings/python/python.pro

@@ -2 +2 @@
 
 python_build.target = python_build
 python_build.depends = setup.py FORCE
-python_build.commands = python setup.py build
+python_build.commands = $$PYTHON_EXEC setup.py build
 
 python_install.target = python_install
 python_install.CONFIG = no_path
-python_install.commands = python setup.py install --skip-build --root=\"$(if $(INSTALL_ROOT),$(INSTALL_ROOT),/)\"
+python_install.commands = $$PYTHON_EXEC setup.py install --skip-build
 
-# This is done so the default /usr/local prefix installs to the "normal"
-# /usr/lib/python{VER}/site-packages directory.
-!contains(PREFIX, ^/usr(/local)?/?$) {
-        python_install.commands += --prefix=\"$${PREFIX}\"
-}
+QMAKE_CLEAN += dummy_file; $$PYTHON_EXEC setup.py clean --all
 
-QMAKE_CLEAN += dummy_file; python setup.py clean --all
-
 PRE_TARGETDEPS += python_build
 QMAKE_LINK=@-echo
 QMAKE_EXTRA_UNIX_TARGETS += python_build