Python-2: updated to 2.7.17

niXman · Mar 8, 2020 · d9cfb25 · d9cfb25
1 parent af9d797
commit d9cfb25
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/patches/Python2/0100-MINGW-BASE-use-NT-thread-model.patch b/patches/Python2/0100-MINGW-BASE-use-NT-thread-model.patch
@@ -139,9 +139,10 @@ diff -Naur Python-2.7.9-orig/configure.ac Python-2.7.9/configure.ac
 +  ac_cv_func_sem_open=skip
 +  ac_cv_func_sched_setscheduler=skip
 +fi
- AC_CHECK_FUNCS(alarm setitimer getitimer bind_textdomain_codeset chown \
+ AC_CHECK_FUNCS(alarm setitimer getitimer chown \
   clock confstr ctermid execv fchmod fchown fork fpathconf ftime ftruncate \
   gai_strerror getgroups getlogin getloadavg getpeername getpgid getpid \
+  getentropy \
 @@ -3812,6 +3882,10 @@
  # the kernel module that provides POSIX semaphores
  # isn't loaded by default, so an attempt to call

diff --git a/patches/Python2/0220-MINGW-default-sys.path-calculations-for-windows-plat.patch b/patches/Python2/0220-MINGW-default-sys.path-calculations-for-windows-plat.patch
@@ -1,7 +1,7 @@
-diff -urN Python-2.7.15_orig/configure.ac Python-2.7.15/configure.ac
---- Python-2.7.15_orig/configure.ac	2018-04-30 01:47:33.000000000 +0300
-+++ Python-2.7.15/configure.ac	2018-06-18 16:42:57.890981600 +0300
-@@ -4845,8 +4845,21 @@
+diff -Naur Python-2.7.9-orig/configure.ac Python-2.7.9/configure.ac
+--- Python-2.7.9-orig/configure.ac	2014-12-11 13:49:48.175400000 +0300
++++ Python-2.7.9/configure.ac	2014-12-11 13:49:48.331400000 +0300
+@@ -4895,8 +4895,21 @@
    THREADHEADERS="$THREADHEADERS \$(srcdir)/$h"
  done
 
@@ -16,17 +16,17 @@ diff -urN Python-2.7.15_orig/configure.ac Python-2.7.15/configure.ac
 +esac
 +
  AC_SUBST(SRCDIRS)
- SRCDIRS="Parser Objects Python Modules"
+ SRCDIRS="Parser Objects Python Modules Modules/_io"
 +case $host in
 +  *-*-mingw*) SRCDIRS="$SRCDIRS PC";;
 +esac
  AC_MSG_CHECKING(for build directories)
  for dir in $SRCDIRS; do
      if test ! -d $dir; then
-diff -urN Python-2.7.15_orig/Makefile.pre.in Python-2.7.15/Makefile.pre.in
---- Python-2.7.15_orig/Makefile.pre.in	2018-04-30 01:47:33.000000000 +0300
-+++ Python-2.7.15/Makefile.pre.in	2018-06-18 16:41:32.244082900 +0300
-@@ -225,7 +225,7 @@
+diff -Naur Python-2.7.9-orig/Makefile.pre.in Python-2.7.9/Makefile.pre.in
+--- Python-2.7.9-orig/Makefile.pre.in	2014-12-10 18:59:50.000000000 +0300
++++ Python-2.7.9/Makefile.pre.in	2014-12-11 13:49:48.331400000 +0300
+@@ -214,7 +214,7 @@
  # Modules
  MODULE_OBJS=	\
  		Modules/config.o \
@@ -35,15 +35,15 @@ diff -urN Python-2.7.15_orig/Makefile.pre.in Python-2.7.15/Makefile.pre.in
  		Modules/main.o \
  		Modules/gcmodule.o
 
-@@ -647,6 +647,7 @@
- 	      -DGITBRANCH="\"`LC_ALL=C $(GITBRANCH)`\"" \
+@@ -591,6 +591,7 @@
+ 	      -DHGBRANCH="\"`LC_ALL=C $(HGBRANCH)`\"" \
  	      -o $@ $(srcdir)/Modules/getbuildinfo.c
 
 +# default sys.path calculations for posix platforms
  Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
  	$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
  		-DPREFIX='"$(prefix)"' \
-@@ -655,6 +656,13 @@
+@@ -599,6 +600,13 @@
  		-DVPATH='"$(VPATH)"' \
  		-o $@ $(srcdir)/Modules/getpath.c
 
@@ -57,9 +57,9 @@ diff -urN Python-2.7.15_orig/Makefile.pre.in Python-2.7.15/Makefile.pre.in
  Modules/python.o: $(srcdir)/Modules/python.c
  	$(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
 
-diff -urN Python-2.7.15_orig/PC/getpathp.c Python-2.7.15/PC/getpathp.c
---- Python-2.7.15_orig/PC/getpathp.c	2018-04-30 01:47:33.000000000 +0300
-+++ Python-2.7.15/PC/getpathp.c	2018-06-18 16:41:32.249083100 +0300
+diff -Naur Python-2.7.9-orig/PC/getpathp.c Python-2.7.9/PC/getpathp.c
+--- Python-2.7.9-orig/PC/getpathp.c	2014-12-10 18:59:58.000000000 +0300
++++ Python-2.7.9/PC/getpathp.c	2014-12-11 13:49:48.331400000 +0300
 @@ -81,10 +81,26 @@
   * information sources.
   */

diff --git a/patches/Python2/1000-dont-link-with-gettext.patch b/patches/Python2/1000-dont-link-with-gettext.patch
@@ -1,7 +1,7 @@
 diff -Naur Python-2.7.9-orig/configure.ac Python-2.7.9/configure.ac
 --- Python-2.7.9-orig/configure.ac	2014-12-11 13:51:21.135800000 +0300
 +++ Python-2.7.9/configure.ac	2014-12-11 13:51:24.614600000 +0300
-@@ -2502,9 +2502,18 @@
+@@ -2502,12 +2502,21 @@
  fi
 
  # check if we need libintl for locale functions
@@ -15,6 +15,9 @@ diff -Naur Python-2.7.9-orig/configure.ac Python-2.7.9/configure.ac
  AC_CHECK_LIB(intl, textdomain,
  	AC_DEFINE(WITH_LIBINTL, 1,
  	[Define to 1 if libintl is needed for locale functions.]))
+ AC_SEARCH_LIBS(bind_textdomain_codeset, intl,
+ 	AC_DEFINE(HAVE_BIND_TEXTDOMAIN_CODESET, 1,
+ 	[Define to 1 if bind_textdomain_codeset is available.]))
 +  ;;
 +esac
 

diff --git a/scripts/python-2.sh b/scripts/python-2.sh
@@ -35,7 +35,7 @@
 
 # **************************************************************************
 
-PKG_VERSION=2.7.16
+PKG_VERSION=2.7.17
 PKG_NAME=Python-${PKG_VERSION}
 PKG_DIR_NAME=Python-${PKG_VERSION}
 PKG_TYPE=.tar.xz