define SAT_ENABLE_PYTHON_PYMALLOC switch for Python >= 3.6

diff --git a/products/compil_scripts/Python-3.6.8.sh b/products/compil_scripts/Python-3.6.8.sh
index a34b9ac91ac239a23c72147b4fe3ceda30ba1858..daa72fab7cc6073b948f71ec5fa7842dcf16f3a2 100755 (executable)
--- a/products/compil_scripts/Python-3.6.8.sh
+++ b/products/compil_scripts/Python-3.6.8.sh
@@ -88,8 +88,8 @@ then
     #
     if [ "${SAT_ENABLE_PYTHON_PYMALLOC}" == "1" ]; then
        cd ${PRODUCT_INSTALL}/include
-       if [ ! -d python36 ]; then
-           ln -s python36m python36
+       if [ ! -d python3.6 ]; then
+           ln -s python3.6m python3.6
        fi
     fi
 fi

diff --git a/products/compil_scripts/Python.sh b/products/compil_scripts/Python.sh
index 4285668f2438b1cd5331cb6c03854631d0d9b09c..daa72fab7cc6073b948f71ec5fa7842dcf16f3a2 100755 (executable)
--- a/products/compil_scripts/Python.sh
+++ b/products/compil_scripts/Python.sh
@@ -21,7 +21,13 @@ if version_ge $VERSION "3.6"; then
     # --without-pymalloc: disable specialized mallocs
     # --with-ensurepip  : installation using bundled pip
     # --enable-optimizations:  recommandé et utilisé par Nijni -> mais trop long!
-    CONFIGURE_ARGUMENTS="--enable-shared --with-threads --without-pymalloc --with-ensurepip=install --with-ssl --enable-loadable-sqlite-extensions"
+    # spns #30153 :  pymalloc on demand
+    CONFIGURE_ARGUMENTS="--enable-shared --with-threads --with-ensurepip=install --with-ssl --enable-loadable-sqlite-extensions"
+    if [ "${SAT_ENABLE_PYTHON_PYMALLOC}" == "1" ]; then
+       CONFIGURE_ARGUMENTS+=" --with-pymalloc"
+    else
+       CONFIGURE_ARGUMENTS+=" --without-pymalloc"
+    fi
 else
     echo "*** Python version is older than version 3.6 ..."
     CONFIGURE_ARGUMENTS="--enable-shared --with-threads --without-pymalloc --enable-unicode=ucs4"
@@ -79,6 +85,13 @@ then
     cd ${PRODUCT_INSTALL}/bin
     ln -s python3 python
     ln -s pip3 pip
+    #
+    if [ "${SAT_ENABLE_PYTHON_PYMALLOC}" == "1" ]; then
+       cd ${PRODUCT_INSTALL}/include
+       if [ ! -d python3.6 ]; then
+           ln -s python3.6m python3.6
+       fi
+    fi
 fi
 
 # fix the path...