3.80b4+panda-master droid api19

Author: pmp-p

sources.32/Python-3.7.2.patchset/external/readline-6.3.tar.gz

@@ -0,0 +1,159 @@
+#!/bin/bash
+
+#GHZIP=https://github.com/python/cpython/archive/v3.7.1rc1.zip
+
+export PYVER=3.8
+export SRC=Python-3.8.0b4
+export SRC_URL=https://www.python.org/ftp/python/3.8.0/Python-3.8.0b4.tar.xz
+
+export TARGET=Android
+
+export OPT_COMMON="--with-computed-gotos --with-system-ffi --with-pydebug=no"
+
+export OPT_HOST="--disable-shared"
+
+export OPT_TARGET="--without-ensurepip --with-c-locale-coercion --disable-ipv6" # --enable-shared"
+
+#pydebug build ?
+export DM=false
+
+#==============================================================================
+#ROOT=$(dirname $(realpath "$0") )
+
+. $SDK/build.functions
+. $SDK/build.${BITS}.functions
+
+set_source_tree 4243
+
+if echo $ANDROID_API|grep -q 19
+then
+    echo -n "#FIXME API-19 : readline/sqlite won't fix : WITH_LIBRARIES==$WITH_LIBRARIES changed to  "
+    export WITH_LIBRARIES="libffi"
+    echo "WITH_LIBRARIES=$WITH_LIBRARIES"
+fi
+
+#export ORIGIN=$(pwd)
+
+echo Will build $TARGET from $ORIGIN source tree
+
+echo "<enter> to continue"
+read
+
+export PYTHONDONTWRITEBYTECODE=1
+
+export PDK_PYTHON=${ORIGIN}/Android/build/python-native/python
+
+export PDK_APYTHON=${ORIGIN}/Android/build/python${PYVER}-android-${ANDROID_API}-${ANDROID_ARCH}/python
+
+export LIB_PYTHON=${ROOT}/DEVICE/fs/usr/lib-$ANDROID_ARCH
+export BIN_PYTHON=${ROOT}/DEVICE/fs/usr/bin
+
+if echo "$@"|grep -q rebuild
+then
+    echo "CLEANING UP"
+    rm -vf $PDK_APYTHON ${ORIGIN}/Android/build/python${PYVER}-android-${ANDROID_API}-${ANDROID_ARCH}/libpython3.*.so
+fi
+
+if [ -f $PDK_APYTHON ]
+then
+    echo "
+    * found TARGET $PDK_APYTHON - skipping HOST + TARGET build
+"
+else
+    if mkdir -p ${DEV_APPDIR}
+    then
+        echo Building HOST + TARGET cpython${PYVER}${PYMODE} from $ORIGIN/Android
+
+        patch_me
+        pwd
+
+        cd $ORIGIN/Android
+
+        #for 3.8
+        touch ../Modules/Setup.dist
+
+        cmd="./makesetup $DEV_PATHS $OPT_COMMON $OPT_TARGET"
+        echo "----------------------------------------------------------------"
+        echo $cmd
+        echo "----------------------------------------------------------------"
+        if $cmd
+        then
+
+            #will fail on ncurses as first pass
+            >$ORIGIN.log
+            echo "to view log : tail -f $ORIGIN.log"
+            make 2>> $ORIGIN.log | pv -w 60 -p -l -s 2640 >>$ORIGIN.log
+            if [ -f $PDK_APYTHON ]
+            then
+                echo "
+
+        Great built on first pass - you lucky owner of the perfect build env, do not dare to update it !
+
+        "
+            else
+                echo "
+
+        Build failed, that was expected because i tell you so
+
+        Logfile is $ORIGIN.log
+
+        "
+                # NEED NDK <16b only 15c still has sgtty.h
+                cp -vf $ORIGIN.patchset/external/ncurses-6.0.mint.tar.gz ${ORIGIN}/Android/build/external-libraries/ncurses-6.0.tar.gz
+                cp -vf $ORIGIN.patchset/external/readline-6.3.tar.gz ${ORIGIN}/Android/build/external-libraries/readline-6.3.tar.gz
+                echo "Stuff fixed ... maybe,  press <enter> to resume build"
+                read
+                echo "to view log : tail -f $ORIGIN.log"
+                make 2>&1  | pv -w 60 -p -l -s 6300 >$ORIGIN.log
+            fi
+            #make install
+        fi
+    fi
+fi
+
+
+cd ${ROOT}
+
+
+if [ -f $PDK_APYTHON ]
+then
+    echo "Installing to ${DEV_APPDIR}"
+    echo
+    mkdir -p $BIN_PYTHON  $LIB_PYTHON/
+
+    build_dir=${ORIGIN}/Android/build/python${PYVER}-android-${ANDROID_API}-${ANDROID_ARCH}
+
+
+    dyn_load=${ROOT}/DEVICE/fs/usr/lib/python${PYVER}/lib-dynload
+
+    mkdir -p "${dyn_load}"
+
+    cp -f ${build_dir}/build/lib.linux-arm-${PYVER}/*.so "${dyn_load}/"
+
+    if $DM
+    then
+        cp -f ${build_dir}/build/lib.linux-arm-${PYVER}/_sysconfigdata_dm_linux_.py "${dyn_load}/"
+    else
+        cp -f ${build_dir}/build/lib.linux-arm-${PYVER}/_sysconfigdata_m_linux_.py "${dyn_load}/"
+    fi
+
+    #FIXME: 3.x -> 3.xdm link
+    if $DM
+    then
+        cp -f ${build_dir}/python "${BIN_PYTHON}/python${PYVER}dm"
+    else
+        cp -f ${build_dir}/python "${BIN_PYTHON}/python${PYVER}m"
+    fi
+    cp -f ${build_dir}/libpython3.*.so "${LIB_PYTHON}/"
+
+    register_pdk PDK_PYTHON $PDK_PYTHON
+    register_pdk PDK_APYTHON $PDK_APYTHON
+    register_pdk PDK_LIB_PYTHON ${LIB_PYTHON}
+
+else
+    echo "I have failed to build $ORIGIN, <press enter to read $ORIGIN.log>"
+    echo "================================================================="
+    cat $ORIGIN.log | more
+    echo "================================================================="
+
+fi

sources.32/Python-3.8.0b4.build

@@ -0,0 +1,12 @@
+--- Python-3.8.0b4/Lib/ctypes/__init__.py	2019-08-29 23:59:20.000000000 +0200
++++ Python-3.8.0b4.32/Lib/ctypes/__init__.py	2019-08-31 12:37:41.115992690 +0200
+@@ -453,6 +453,9 @@
+     pythonapi = PyDLL("python dll", None, _sys.dllhandle)
+ elif _sys.platform == "cygwin":
+     pythonapi = PyDLL("libpython%d.%d.dll" % _sys.version_info[:2])
++elif _sys.platform in ("android","bionic"):
++    print('444:bionic',_sys.version_info,file=_sys.stderr)
++    pythonapi = PyDLL("libpython%d.%d.so" % _sys.version_info[:2] )
+ else:
+     pythonapi = PyDLL(None)
+ 

sources.32/Python-3.8.0b4.patchset/Lib_ctypes___init__.py.diff

@@ -0,0 +1,11 @@
+--- Python-3.8.0b4/Lib/zipfile.py	2019-08-29 23:59:20.000000000 +0200
++++ Python-3.8.0b4.32/Lib/zipfile.py	2019-08-31 09:14:19.331179000 +0200
+@@ -1570,7 +1570,7 @@
+         zinfo.compress_size = 0
+         zinfo.CRC = 0
+ 
+-        zinfo.flag_bits = 0x00
++        #zinfo.flag_bits = 0x00
+         if zinfo.compress_type == ZIP_LZMA:
+             # Compressed data includes an end-of-stream (EOS) marker
+             zinfo.flag_bits |= 0x02

sources.32/Python-3.8.0b4.patchset/Lib_zipfile.py.diff

@@ -1,6 +1,6 @@
---- cpython-master/Makefile.pre.in	2018-01-23 22:26:07.000000000 +0100
-+++ cpython-master.api19/Makefile.pre.in	2018-01-23 23:55:20.000000000 +0100
-@@ -215,7 +215,7 @@
+--- Python-3.8.0b4/Makefile.pre.in	2019-08-29 23:59:20.000000000 +0200
++++ Python-3.8.0b4.32/Makefile.pre.in	2019-08-31 11:57:53.529672465 +0200
+@@ -225,7 +225,7 @@
  PY3LIBRARY=     @PY3LIBRARY@
  DLLLIBRARY=	@DLLLIBRARY@
  LDLIBRARYDIR=   @LDLIBRARYDIR@

…hon-master.patchset/Makefile.pre.in.diff …on-3.8.0b4.patchset/Makefile.pre.in.diffsources.32/cpython-master.patchset/Makefile.pre.in.diff renamed to sources.32/Python-3.8.0b4.patchset/Makefile.pre.in.diff sources.32/cpython-master.patchset/Makefile.pre.in.diff renamed to sources.32/Python-3.8.0b4.patchset/Makefile.pre.in.diff

@@ -1,6 +1,6 @@
---- cpython-master/Modules/_localemodule.c	2018-01-23 22:26:07.000000000 +0100
-+++ cpython-master.api19/Modules/_localemodule.c	2018-01-24 16:32:07.000000000 +0100
-@@ -103,6 +103,10 @@
+--- Python-3.8.0b4/Modules/_localemodule.c	2019-08-29 23:59:20.000000000 +0200
++++ Python-3.8.0b4.32/Modules/_localemodule.c	2019-08-31 11:57:53.533672312 +0200
+@@ -97,6 +97,10 @@
          PyErr_SetString(Error, "invalid locale category");
          return NULL;
      }
@@ -11,15 +11,18 @@
  #endif
 
      if (locale) {
-@@ -144,7 +148,16 @@
+@@ -214,7 +218,19 @@
      }
 
      /* if LC_NUMERIC is different in the C library, use saved value */
--    l = localeconv();
+-    lc = localeconv();
++
 +//PMPP API<21
-+#if __ANDROID_API__ < 21
 +    /* Don't even try on Android's broken locale.h. */
 +    /* maybe can use c++ stdlib to implement */
++
++#if __ANDROID_API__ < 21
++
 +    goto failed;
 +#else
 +     /* if LC_NUMERIC is different in the C library, use saved value */

…er.patchset/Modules__localemodule.c.diff …b4.patchset/Modules__localemodule.c.diffsources.32/cpython-master.patchset/Modules__localemodule.c.diff renamed to sources.32/Python-3.8.0b4.patchset/Modules__localemodule.c.diff sources.32/cpython-master.patchset/Modules__localemodule.c.diff renamed to sources.32/Python-3.8.0b4.patchset/Modules__localemodule.c.diff

@@ -1,5 +1,5 @@
---- cpython-master/Modules/mmapmodule.c	2018-01-23 22:26:07.000000000 +0100
-+++ cpython-master.api19/Modules/mmapmodule.c	2018-01-23 23:55:20.000000000 +0100
+--- Python-3.8.0b4/Modules/mmapmodule.c	2019-08-29 23:59:20.000000000 +0200
++++ Python-3.8.0b4.32/Modules/mmapmodule.c	2019-08-31 11:57:53.541672005 +0200
 @@ -79,6 +79,12 @@
  #  define MAP_ANONYMOUS MAP_ANON
  #endif

…aster.patchset/Modules_mmapmodule.c.diff …8.0b4.patchset/Modules_mmapmodule.c.diffsources.32/cpython-master.patchset/Modules_mmapmodule.c.diff renamed to sources.32/Python-3.8.0b4.patchset/Modules_mmapmodule.c.diff sources.32/cpython-master.patchset/Modules_mmapmodule.c.diff renamed to sources.32/Python-3.8.0b4.patchset/Modules_mmapmodule.c.diff

@@ -1,21 +1,29 @@
---- cpython-master/Modules/posixmodule.c	2018-01-23 22:26:07.000000000 +0100
-+++ cpython-master.api19/Modules/posixmodule.c	2018-01-23 23:55:20.000000000 +0100
-@@ -394,6 +393,11 @@
- #define MODNAME "posix"
+--- Python-3.8.0b4/Modules/posixmodule.c	2019-08-29 23:59:20.000000000 +0200
++++ Python-3.8.0b4.32/Modules/posixmodule.c	2019-08-31 11:57:53.549671698 +0200
+@@ -63,7 +63,6 @@
+ disguised Unix interface).  Refer to the library manual and\n\
+ corresponding Unix manual entries for more information on calls.");
+ 
+-
+ #ifdef HAVE_SYS_UIO_H
+ #include <sys/uio.h>
+ #endif
+@@ -497,6 +496,11 @@
  #endif
-
+ }
+ 
 +//PMPP API<21
 +#if __ANDROID_API__ < 21
 +    extern ssize_t sendfile(int out_fd, int in_fd, off_t *offset, size_t count);
 +#endif
 +//PMPP API<21
-
- #ifdef HAVE_FORK
- static void
-@@ -5885,6 +5889,51 @@
+ 
+ #ifdef MS_WINDOWS
+ /* defined in fileutils.c */
+@@ -6560,6 +6564,51 @@
  for both the master and slave ends.
  [clinic start generated code]*/
-
+ 
 +#ifdef __ANDROID__
 +    static PyObject *
 +    os_openpty_impl(PyObject *module)
@@ -64,12 +72,24 @@
  static PyObject *
  os_openpty_impl(PyObject *module)
  /*[clinic end generated code: output=98841ce5ec9cef3c input=f3d99fd99e762907]*/
-@@ -5973,7 +6022,7 @@
+@@ -6648,7 +6697,7 @@
      return NULL;
  }
  #endif /* defined(HAVE_OPENPTY) || defined(HAVE__GETPTY) || defined(HAVE_DEV_PTMX) */
 -
 +#endif
-
+ 
  #ifdef HAVE_FORKPTY
  /*[clinic input]
+@@ -9799,7 +9848,11 @@
+             errno = result;
+     }
+ #else
++    #if __ANDROID_API__ < 21
++        result = ftruncate(path->narrow, length);
++    #else
+     result = truncate(path->narrow, length);
++    #endif
+ #endif
+     _Py_END_SUPPRESS_IPH
+     Py_END_ALLOW_THREADS

…ster.patchset/Modules_posixmodule.c.diff ….0b4.patchset/Modules_posixmodule.c.diffsources.32/cpython-master.patchset/Modules_posixmodule.c.diff renamed to sources.32/Python-3.8.0b4.patchset/Modules_posixmodule.c.diff sources.32/cpython-master.patchset/Modules_posixmodule.c.diff renamed to sources.32/Python-3.8.0b4.patchset/Modules_posixmodule.c.diff

@@ -1,6 +1,6 @@
---- cpython-master/Modules/signalmodule.c	2018-01-23 22:26:07.000000000 +0100
-+++ cpython-master.api19/Modules/signalmodule.c	2018-01-23 23:55:20.000000000 +0100
-@@ -40,6 +40,13 @@
+--- Python-3.8.0b4/Modules/signalmodule.c	2019-08-29 23:59:20.000000000 +0200
++++ Python-3.8.0b4.32/Modules/signalmodule.c	2019-08-31 11:57:53.553671545 +0200
+@@ -44,6 +44,13 @@
  #define SIG_ERR ((PyOS_sighandler_t)(-1))
  #endif
 

…ter.patchset/Modules_signalmodule.c.diff …0b4.patchset/Modules_signalmodule.c.diffsources.32/cpython-master.patchset/Modules_signalmodule.c.diff renamed to sources.32/Python-3.8.0b4.patchset/Modules_signalmodule.c.diff sources.32/cpython-master.patchset/Modules_signalmodule.c.diff renamed to sources.32/Python-3.8.0b4.patchset/Modules_signalmodule.c.diff

@@ -1,14 +1,14 @@
---- cpython-master/Modules/timemodule.c	2018-01-23 22:26:07.000000000 +0100
-+++ cpython-master.api19/Modules/timemodule.c	2018-01-23 23:55:20.000000000 +0100
-@@ -477,6 +477,7 @@
+--- Python-3.8.0b4/Modules/timemodule.c	2019-08-29 23:59:20.000000000 +0200
++++ Python-3.8.0b4.32/Modules/timemodule.c	2019-08-31 11:57:53.557671392 +0200
+@@ -461,6 +461,7 @@
  }
 
  #ifndef HAVE_TIMEGM
 +#ifndef CRYSTAX
  static time_t
  timegm(struct tm *p)
  {
-@@ -488,6 +489,7 @@
+@@ -472,6 +473,7 @@
          ((p->tm_year-1)/100)*86400 + ((p->tm_year+299)/400)*86400;
  }
  #endif