Browse Source

upgrading package: python 2.5.2 -> 2.6

master
parent
commit
93d19f1678
  1. 63
      python/python.patch
  2. 4
      python/python.spec

63
python/python.patch

@ -1,35 +1,7 @@
Index: Include/pyport.h
--- Include/pyport.h.orig 2008-02-14 12:26:18 +0100
+++ Include/pyport.h 2008-02-25 07:54:15 +0100
@@ -401,8 +401,12 @@
* config to #define Py_HUGE_VAL to something that works on your platform.
*/
#ifndef Py_HUGE_VAL
+#if defined (__SVR4) && defined (__sun)
+#define Py_HUGE_VAL HUGE
+#else
#define Py_HUGE_VAL HUGE_VAL
#endif
+#endif
/* Py_OVERFLOWED(X)
* Return 1 iff a libm function overflowed. Set errno to 0 before calling
Index: Modules/_ctypes/libffi/configure
--- Modules/_ctypes/libffi/configure.orig 2007-09-05 01:47:16 +0200
+++ Modules/_ctypes/libffi/configure 2008-02-25 07:54:15 +0100
@@ -3516,7 +3516,7 @@
cris-*-*) TARGET=LIBFFI_CRIS; TARGETDIR=cris;;
s390-*-linux-*) TARGET=S390; TARGETDIR=s390;;
s390x-*-linux-*) TARGET=S390; TARGETDIR=s390;;
-x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
+x86_64-*-linux* | amd64-*-freebsd* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
sh-*-linux* | sh[34]*-*-linux*) TARGET=SH; TARGETDIR=sh;;
sh-*-rtems*) TARGET=SH; TARGETDIR=sh;;
sh64-*-linux* | sh5*-*-linux*) TARGET=SH64; TARGETDIR=sh64;;
Index: configure
--- configure.orig 2008-02-13 20:17:17 +0100
+++ configure 2008-02-25 07:56:56 +0100
@@ -3014,9 +3014,9 @@
--- configure.orig 2008-09-07 21:19:04 +0200
+++ configure 2008-10-02 18:39:15 +0200
@@ -3098,9 +3098,9 @@
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then
@ -41,7 +13,7 @@ Index: configure
fi
else
if test "$GCC" = yes; then
@@ -4442,7 +4442,7 @@
@@ -4530,7 +4530,7 @@
# debug builds.
OPT="-g -Wall $STRICT_PROTO"
else
@ -50,7 +22,7 @@ Index: configure
fi
;;
*)
@@ -11661,7 +11661,7 @@
@@ -13198,7 +13198,7 @@
then
LINKFORSHARED="-Wl,--export-dynamic"
fi;;
@ -60,9 +32,9 @@ Index: configure
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
then
Index: setup.py
--- setup.py.orig 2008-02-05 00:41:02 +0100
+++ setup.py 2008-02-25 07:54:15 +0100
@@ -244,8 +244,8 @@
--- setup.py.orig 2008-09-30 02:15:45 +0200
+++ setup.py 2008-10-02 18:44:21 +0200
@@ -310,8 +310,8 @@
def detect_modules(self):
# Ensure that /usr/local is always used
@ -73,7 +45,7 @@ Index: setup.py
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
@@ -521,8 +521,6 @@
@@ -612,8 +612,6 @@
depends = ['socketmodule.h']) )
# Detect SSL support for the socket module (via _ssl)
search_for_ssl_incs_in = [
@ -82,7 +54,7 @@ Index: setup.py
]
ssl_incs = find_file('openssl/ssl.h', inc_dirs,
search_for_ssl_incs_in
@@ -533,8 +531,7 @@
@@ -624,8 +622,7 @@
if krb5_h:
ssl_incs += krb5_h
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@ -92,19 +64,22 @@ Index: setup.py
] )
if (ssl_incs is not None and
@@ -619,11 +616,9 @@
@@ -740,14 +737,8 @@
# top of the normal inc_dirs.
db_inc_paths = [
'/usr/include/db4',
- '/usr/local/include/db4',
'/opt/sfw/include/db4',
'/sw/include/db4',
'/usr/include/db3',
- '/usr/include/db3',
- '/usr/local/include/db3',
'/opt/sfw/include/db3',
'/sw/include/db3',
- '/opt/sfw/include/db3',
- # Fink defaults (http://fink.sourceforge.net/)
'/sw/include/db4',
- '/sw/include/db3',
]
@@ -1242,6 +1237,7 @@
# 4.x minor number specific paths
for x in gen_db_minor_ver_nums(4):
@@ -1537,6 +1528,7 @@
dotversion = dotversion[:-1] + '.' + dotversion[-1]
tcl_include_sub = []
tk_include_sub = []

4
python/python.spec

@ -31,8 +31,8 @@ Distribution: OpenPKG Community
Class: BASE
Group: Language
License: GPL
Version: 2.5.2
Release: 20080304
Version: 2.6
Release: 20081002
# package options
%option with_readline no

Loading…
Cancel
Save