Skip to content

C
core
Kaydet (Commit) 91d5de11 authored tarafından Jürgen Schmidt's avatar Jürgen Schmidt
Dosyalara gözat
Seçenekler

#124680# update pyhton from 2.7.5 to 2.7.6

üst c9cdd975
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 41 deletions
external_deps.lst
Dosyayı görüntüle @ 91d5de11
......@@ -181,7 +181,7 @@ if (SYSTEM_LIBXSLT != YES)
if (SOLAR_JAVA == TRUE)
MD5 = 63574e3ada44f473892a61a2da433a59
name = apache-tomcat-5.5.36-src.tar.gz
# URL1 = http://www.alliedquotes.com/mirrors/apache/tomcat/tomcat-5/v5.5.36/src/apache-tomcat-5.5.36-src.tar.gz
URL1 = http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/src/apache-tomcat-5.5.36-src.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SOLAR_JAVA == TRUE)
......@@ -197,9 +197,9 @@ if (ENABLE_MEDIAWIKI == YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_PYTHON != YES)
MD5 = 6334b666b7ff2038c761d7b27ba699c1
name = Python-2.7.5.tar.bz2
URL1 = http://www.python.org/ftp/python/2.7.5/Python-2.7.5.tar.bz2
MD5 = 1d8728eb0dfcac72a0fd99c17ec7f386
name = Python-2.7.6.tgz
URL1 = http://www.python.org/ftp/python/2.7.6/Python-2.7.6.tgz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_BOOST != YES)
......
python/makefile.mk
Dosyayı görüntüle @ 91d5de11
......@@ -42,7 +42,7 @@ all:
TARFILE_NAME=Python-$(PYVERSION)
TARFILE_MD5=6334b666b7ff2038c761d7b27ba699c1
TARFILE_MD5=1d8728eb0dfcac72a0fd99c17ec7f386
PATCH_FILES=\
python-solaris.patch \
python-freebsd.patch \
......
python/prj/d.lst
Dosyayı görüntüle @ 91d5de11
This diff is collapsed.
python/python-2.7.5-nohardlink.patch → python/python-2.7.6-nohardlink.patch
Dosyayı görüntüle @ 91d5de11
--- misc/Python-2.7.5/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500
+++ misc/build/Python-2.7.5/Makefile.pre.in 2012-07-22 14:54:26.000000000 -0500
--- misc/Python-2.7.6/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500
+++ misc/build/Python-2.7.6/Makefile.pre.in 2012-07-22 14:54:26.000000000 -0500
@@ -427,7 +427,7 @@
libpython$(VERSION).so: $(LIBRARY_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
......
python/python-2.7.5-sysbase.patch → python/python-2.7.6-sysbase.patch
Dosyayı görüntüle @ 91d5de11
--- misc/Python-2.7.5/configure 2012-04-09 18:07:36.000000000 -0500
+++ misc/build/Python-2.7.5/configure 2012-07-22 15:01:20.000000000 -0500
--- misc/Python-2.7.6/configure 2012-04-09 18:07:36.000000000 -0500
+++ misc/build/Python-2.7.6/configure 2012-07-22 15:01:20.000000000 -0500
@@ -2982,7 +2982,9 @@
if test -z "$MACHDEP"
then
......
python/python-freebsd.patch
Dosyayı görüntüle @ 91d5de11
--- misc/Python-2.7.5/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000 -0500
+++ misc/build/Python-2.7.5/Lib/plat-freebsd9/IN.py 2012-08-01 18:56:04.000000000 -0500
--- misc/Python-2.7.6/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000 -0500
+++ misc/build/Python-2.7.6/Lib/plat-freebsd9/IN.py 2012-08-01 18:56:04.000000000 -0500
@@ -0,0 +1,612 @@
+# Generated by h2py from /usr/include/netinet/in.h
+
......@@ -613,14 +613,14 @@
+IPV6CTL_NORBIT_RAIF = 49
+IPV6CTL_RFC6204W3 = 50
+IPV6CTL_MAXID = 51
--- misc/Python-2.7.5/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000 -0500
+++ misc/build/Python-2.7.5/Lib/plat-freebsd9/regen 2012-08-01 18:55:27.000000000 -0500
--- misc/Python-2.7.6/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000 -0500
+++ misc/build/Python-2.7.6/Lib/plat-freebsd9/regen 2012-08-01 18:55:27.000000000 -0500
@@ -0,0 +1,3 @@
+#! /bin/sh
+set -v
+python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
--- misc/Python-2.7.5/Lib/test/test_threading.py 2012-04-09 18:07:32.000000000 -0500
+++ misc/build/Python-2.7.5/Lib/test/test_threading.py 2012-08-01 18:44:40.000000000 -0500
--- misc/Python-2.7.6/Lib/test/test_threading.py 2012-04-09 18:07:32.000000000 -0500
+++ misc/build/Python-2.7.6/Lib/test/test_threading.py 2012-08-01 18:44:40.000000000 -0500
@@ -421,7 +421,7 @@
# #12316 and #11870), and fork() from a worker thread is known to trigger
# problems with some operating systems (issue #3863): skip problematic tests
......@@ -630,8 +630,8 @@
'os2emx')
def _run_and_join(self, script):
--- misc/Python-2.7.5/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500
+++ misc/build/Python-2.7.5/Modules/_ctypes/libffi/configure 2012-08-01 18:53:21.000000000 -0500
--- misc/Python-2.7.6/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500
+++ misc/build/Python-2.7.6/Modules/_ctypes/libffi/configure 2012-08-01 18:53:21.000000000 -0500
@@ -6289,7 +6289,7 @@
rm -rf conftest*
;;
......@@ -651,8 +651,8 @@
powerpc*-*-rtems*)
TARGET=POWERPC; TARGETDIR=powerpc
;;
--- misc/Python-2.7.5/Modules/fcntlmodule.c 2012-04-09 18:07:34.000000000 -0500
+++ misc/build/Python-2.7.5/Modules/fcntlmodule.c 2012-08-01 18:44:40.000000000 -0500
--- misc/Python-2.7.6/Modules/fcntlmodule.c 2012-04-09 18:07:34.000000000 -0500
+++ misc/build/Python-2.7.6/Modules/fcntlmodule.c 2012-08-01 18:44:40.000000000 -0500
@@ -97,20 +97,15 @@
{
#define IOCTL_BUFSZ 1024
......@@ -704,8 +704,8 @@
" an integer and optionally an integer or buffer argument",
conv_descriptor, &fd, &code, &arg)) {
return NULL;
--- misc/Python-2.7.5/Python/thread_pthread.h 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.5/Python/thread_pthread.h 2012-08-01 18:44:40.000000000 -0500
--- misc/Python-2.7.6/Python/thread_pthread.h 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.6/Python/thread_pthread.h 2012-08-01 18:44:40.000000000 -0500
@@ -38,13 +38,18 @@
#endif
#endif
......@@ -759,9 +759,9 @@
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_destroy(&attrs);
#endif
diff -ruN misc/Python-2.7.5/configure misc/build/Python-2.7.5/configure
--- misc/Python-2.7.5/configure 2012-04-09 18:07:36.000000000 -0500
+++ misc/build/Python-2.7.5/configure 2012-08-01 18:44:40.000000000 -0500
diff -ruN misc/Python-2.7.6/configure misc/build/Python-2.7.6/configure
--- misc/Python-2.7.6/configure 2012-04-09 18:07:36.000000000 -0500
+++ misc/build/Python-2.7.6/configure 2012-08-01 18:44:40.000000000 -0500
@@ -4916,7 +4916,7 @@
;;
SunOS*)
......@@ -783,9 +783,9 @@ diff -ruN misc/Python-2.7.5/configure misc/build/Python-2.7.5/configure
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
diff -ruN misc/Python-2.7.5/setup.py misc/build/Python-2.7.5/setup.py
--- misc/Python-2.7.5/setup.py 2012-04-09 18:07:36.000000000 -0500
+++ misc/build/Python-2.7.5/setup.py 2012-08-01 18:44:40.000000000 -0500
diff -ruN misc/Python-2.7.6/setup.py misc/build/Python-2.7.6/setup.py
--- misc/Python-2.7.6/setup.py 2012-04-09 18:07:36.000000000 -0500
+++ misc/build/Python-2.7.6/setup.py 2012-08-01 18:44:40.000000000 -0500
@@ -1555,7 +1540,7 @@
macros = dict()
libraries = []
......
python/python-md5.patch
Dosyayı görüntüle @ 91d5de11
diff -ru misc/Python-2.7.5/Modules/Setup.dist misc/build/Python-2.7.5/Modules/Setup.dist
--- misc/Python-2.7.5/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500
+++ misc/build/Python-2.7.5/Modules/Setup.dist 2012-07-24 17:08:56.000000000 -0500
diff -ru misc/Python-2.7.6/Modules/Setup.dist misc/build/Python-2.7.6/Modules/Setup.dist
--- misc/Python-2.7.6/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500
+++ misc/build/Python-2.7.6/Modules/Setup.dist 2012-07-24 17:08:56.000000000 -0500
@@ -248,14 +248,14 @@
# Message-Digest Algorithm, described in RFC 1321. The necessary files
# md5.c and md5.h are included here.
......
python/python-solaris.patch
Dosyayı görüntüle @ 91d5de11
--- misc/Python-2.7.5/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500
+++ misc/build/Python-2.7.5/Include/pyport.h 2012-07-24 18:19:52.000000000 -0500
--- misc/Python-2.7.6/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500
+++ misc/build/Python-2.7.6/Include/pyport.h 2012-07-24 18:19:52.000000000 -0500
@@ -603,11 +603,6 @@
in platform-specific #ifdefs.
**************************************************************************/
......
python/python-solver-before-std.patch
Dosyayı görüntüle @ 91d5de11
--- misc/Python-2.7.5/setup.py 2013-07-01 17:51:46.237674580 +0200
+++ misc/build/Python-2.7.5/setup.py 2013-07-01 17:51:24.230453108 +0200
--- misc/Python-2.7.6/setup.py 2013-07-01 17:51:46.237674580 +0200
+++ misc/build/Python-2.7.6/setup.py 2013-07-01 17:51:24.230453108 +0200
@@ -80,61 +80,62 @@
# system, but with only header files and libraries.
sysroot = macosx_sdk_root()
......
python/python-ssl.patch
Dosyayı görüntüle @ 91d5de11
diff -ru misc/Python-2.7.5/PCbuild/build_ssl.py misc/build/Python-2.7.5/PCbuild/build_ssl.py
--- misc/Python-2.7.5/PCbuild/build_ssl.py 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.5/PCbuild/build_ssl.py 2012-07-25 14:37:37.000000000 -0500
diff -ru misc/Python-2.7.6/PCbuild/build_ssl.py misc/build/Python-2.7.6/PCbuild/build_ssl.py
--- misc/Python-2.7.6/PCbuild/build_ssl.py 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.6/PCbuild/build_ssl.py 2012-07-25 14:37:37.000000000 -0500
@@ -253,4 +253,4 @@
sys.exit(rc)
if __name__=='__main__':
- main()
+ sys.exit(0)
diff -ru misc/Python-2.7.5/setup.py misc/build/Python-2.7.5/setup.py
--- misc/Python-2.7.5/setup.py 2012-04-09 18:07:36.000000000 -0500
+++ misc/build/Python-2.7.5/setup.py 2012-07-25 14:37:37.000000000 -0500
diff -ru misc/Python-2.7.6/setup.py misc/build/Python-2.7.6/setup.py
--- misc/Python-2.7.6/setup.py 2012-04-09 18:07:36.000000000 -0500
+++ misc/build/Python-2.7.6/setup.py 2012-07-25 14:37:37.000000000 -0500
@@ -702,7 +702,15 @@
exts.append( Extension('_socket', ['socketmodule.c'],
depends = ['socketmodule.h']) )
......
python/pyversion.mk
Dosyayı görüntüle @ 91d5de11
......@@ -22,7 +22,7 @@
# in the python project accordingly !!!
PYMAJOR=2
PYMINOR=7
PYMICRO=5
PYMICRO=6
PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
.IF "$(GUI)" == "UNX"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment