Changeset 14015


Ignorieren:
Zeitstempel:
08.01.2017 20:21:23 (vor 3 Monaten)
Autor:
er13
Nachricht:

python:

Ort:
trunk
Dateien:
9 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/CHANGELOG

    r14013 r14015  
    162162    * pptpd 1.4.0 
    163163    * protobuf-c 1.1.0 
    164     * Python 2.7.12 
     164    * Python 2.7.13 
    165165    * python-bjoern 1.3.4 
    166166    * pycrypto 2.6.1 
  • trunk/make/python/Config.in

    r13815 r14015  
    11config FREETZ_PACKAGE_PYTHON 
    2     bool "Python 2.7.12" 
     2    bool "Python 2.7.13" 
    33    select FREETZ_LIB_libpython2 if !FREETZ_PACKAGE_PYTHON_STATIC 
    44    select FREETZ_LIB_libdl 
  • trunk/make/python/patches/010-prefer-user-supplied-interpreter.freetz.patch

    r13815 r14015  
    11--- configure 
    22+++ configure 
    3 @@ -2897,6 +2897,9 @@ 
     3@@ -2919,6 +2919,9 @@ 
    44     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python interpreter for cross build" >&5 
    55 $as_echo_n "checking for python interpreter for cross build... " >&6; } 
     
    1111        which $interp >/dev/null 2>&1 || continue 
    1212        if $interp -c 'import sys;sys.exit(not (sys.version_info[:2] >= (2,7) and sys.version_info[0] < 3))'; then 
    13 @@ -2907,6 +2910,7 @@ 
     13@@ -2929,6 +2932,7 @@ 
    1414         if test x$interp = x; then 
    1515        as_fn_error $? "python$PACKAGE_VERSION interpreter not found" "$LINENO" 5 
  • trunk/make/python/patches/015-python_for_compile.freetz.patch

    r13815 r14015  
    11--- Makefile.pre.in 
    22+++ Makefile.pre.in 
    3 @@ -209,6 +209,9 @@ 
     3@@ -208,6 +208,9 @@ 
    44 TCLTK_INCLUDES=    @TCLTK_INCLUDES@ 
    55 TCLTK_LIBS=    @TCLTK_LIBS@ 
     
    1111 # We exclude unittests with -x that take a rediculious amount of time to 
    1212 # run in the instrumented training build or do not provide much value. 
    13 @@ -1132,28 +1135,28 @@ 
     13@@ -1120,28 +1123,28 @@ 
    1414        $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ 
    1515            $(DESTDIR)$(LIBDEST)/distutils/tests ; \ 
  • trunk/make/python/patches/020-pgen_for_build.freetz.patch

    r13815 r14015  
    11--- Makefile.pre.in 
    22+++ Makefile.pre.in 
    3 @@ -249,6 +249,8 @@ 
     3@@ -248,6 +248,8 @@ 
    44 ########################################################################## 
    55 # Parser 
     
    1010 PSRCS=     \ 
    1111        Parser/acceler.c \ 
    12 @@ -686,14 +688,14 @@ 
    13  $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN) 
     12@@ -684,7 +686,7 @@ 
     13  
     14 $(GRAMMAR_H): @GENERATED_COMMENT@ $(GRAMMAR_INPUT) $(PGEN) 
    1415    @$(MKDIR_P) Include 
    15     # Avoid copying the file onto itself for an in-tree build 
    16 -   if test "$(cross_compiling)" != "yes"; then \ 
    17 -       $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \ 
    18 +   if true || test "$(cross_compiling)" != "yes"; then \ 
    19 +       $(PGEN_FOR_BUILD) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \ 
    20     else \ 
    21         cp $(srcdir)/Include/graminit.h $(GRAMMAR_H).tmp; \ 
    22         mv $(GRAMMAR_H).tmp $(GRAMMAR_H); \ 
    23     fi 
    24  $(GRAMMAR_C): $(GRAMMAR_H) 
    25 -   if test "$(cross_compiling)" != "yes"; then \ 
    26 +   if true || test "$(cross_compiling)" != "yes"; then \ 
    27         touch $(GRAMMAR_C); \ 
    28     else \ 
    29         cp $(srcdir)/Python/graminit.c $(GRAMMAR_C).tmp; \ 
     16-   $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) 
     17+   $(PGEN_FOR_BUILD) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) 
     18 $(GRAMMAR_C): @GENERATED_COMMENT@ $(GRAMMAR_H) 
     19    touch $(GRAMMAR_C) 
     20  
  • trunk/make/python/patches/300-dlopen_DYNLOADFILE_fix.freetz.patch

    r13815 r14015  
    11--- configure 
    22+++ configure 
    3 @@ -8686,6 +8686,7 @@ 
     3@@ -8876,6 +8876,7 @@ 
    44 if test "x$ac_cv_lib_dl_dlopen" = xyes; then : 
    55   cat >>confdefs.h <<_ACEOF 
     
    99  
    1010   LIBS="-ldl $LIBS" 
    11 @@ -10355,6 +10356,7 @@ 
     11@@ -10503,6 +10504,7 @@ 
    1212  
    1313 DLINCLDIR=. 
     
    1717 # platforms, such as AIX, have dlopen(), but don't want to use it. 
    1818 for ac_func in dlopen 
    19 @@ -10367,6 +10369,7 @@ 
     19@@ -10515,6 +10517,7 @@ 
    2020  
    2121 fi 
     
    2525  
    2626 # DYNLOADFILE specifies which dynload_*.o file we will use for dynamic 
    27 @@ -10378,7 +10381,7 @@ 
     27@@ -10526,7 +10529,7 @@ 
    2828 then 
    2929    case $ac_sys_system/$ac_sys_release in 
     
    3434    else DYNLOADFILE="dynload_aix.o" 
    3535    fi 
    36 @@ -10391,7 +10394,7 @@ 
     36@@ -10539,7 +10542,7 @@ 
    3737    *) 
    3838    # use dynload_shlib.c and dlopen() if we have it; otherwise stub 
  • trunk/make/python/patches/310-disable_epoll.freetz.patch

    r13815 r14015  
    33--- configure 
    44+++ configure 
    5 @@ -10605,6 +10605,7 @@ 
     5@@ -10753,6 +10753,7 @@ 
    66  
    77 fi 
     
    1111 $as_echo_n "checking for epoll... " >&6; } 
    1212 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 
    13 @@ -10630,6 +10631,7 @@ 
     13@@ -10778,6 +10779,7 @@ 
    1414  
    1515 fi 
  • trunk/make/python/python.mk

    r13815 r14015  
    1 $(call PKG_INIT_BIN, 2.7.12) 
     1$(call PKG_INIT_BIN, 2.7.13) 
    22$(PKG)_MAJOR_VERSION:=$(call GET_MAJOR_VERSION,$($(PKG)_VERSION)) 
    33$(PKG)_SOURCE:=Python-$($(PKG)_VERSION).tar.xz 
    4 $(PKG)_SOURCE_MD5:=57dffcee9cee8bb2ab5f82af1d8e9a69 
     4$(PKG)_SOURCE_MD5:=53b43534153bb2a0363f08bae8b9d990 
    55$(PKG)_SITE:=http://www.python.org/ftp/python/$($(PKG)_VERSION) 
    66 
  • trunk/tools/make/python-host/python-host.mk

    r13815 r14015  
    1 PYTHON_HOST_VERSION:=2.7.12 
     1PYTHON_HOST_VERSION:=2.7.13 
    22PYTHON_HOST_SOURCE:=Python-$(PYTHON_HOST_VERSION).tar.xz 
    3 PYTHON_HOST_MD5:=57dffcee9cee8bb2ab5f82af1d8e9a69 
     3PYTHON_HOST_MD5:=53b43534153bb2a0363f08bae8b9d990 
    44PYTHON_HOST_SITE:=http://www.python.org/ftp/python/$(PYTHON_HOST_VERSION) 
    55 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.