[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - configure.ac

Andras Timar andras.timar at collabora.com
Sun Jan 12 13:04:46 PST 2014


 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 752cf6e270e2138380ebfc3b1ee4b99a5ca9a8a5
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun Jan 12 13:01:18 2014 -0800

    change PYTHON_VERSION back to old value
    
    because MSP patch cannot rename directories, and MSP installed over
    the older base would result in immediate crash if Python cannot find
    its libs. Version number is hard coded in PYTHONPATH.
    
    Change-Id: Ib90ba3ab6f19a89f1ab2ae6fbc0aad9365d3645d

diff --git a/configure.ac b/configure.ac
index 43b877d..a88cb6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7556,7 +7556,7 @@ internal)
     SYSTEM_PYTHON=NO
     PYTHON_VERSION_MAJOR=3
     PYTHON_VERSION_MINOR=3
-    PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.3
+    PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.0
     BUILD_TYPE="$BUILD_TYPE PYTHON"
     # Embedded Python dies without Home set
     if test "$HOME" = ""; then


More information about the Libreoffice-commits mailing list