|
|
|
|
Index: Include/pyport.h
|
|
|
|
|
--- Include/pyport.h.orig 2006-06-10 14:23:46 +0200
|
|
|
|
|
+++ Include/pyport.h 2006-10-11 09:29:21 +0200
|
|
|
|
|
@@ -370,8 +370,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: configure
|
|
|
|
|
--- configure.orig 2006-09-05 04:54:42 +0200
|
|
|
|
|
+++ configure 2006-10-11 09:29:21 +0200
|
|
|
|
|
@@ -3800,11 +3800,11 @@
|
|
|
|
|
# debug builds.
|
|
|
|
|
OPT="-g -Wall $STRICT_PROTO"
|
|
|
|
|
else
|
|
|
|
|
- OPT="-g -O3 -Wall $STRICT_PROTO"
|
|
|
|
|
+ OPT="-g -O2 -Wall $STRICT_PROTO"
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
- OPT="-O3 -Wall $STRICT_PROTO"
|
|
|
|
|
+ OPT="-O2 -Wall $STRICT_PROTO"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
case $ac_sys_system in
|
|
|
|
|
@@ -11136,7 +11136,7 @@
|
|
|
|
|
then
|
|
|
|
|
LINKFORSHARED="-Wl,--export-dynamic"
|
|
|
|
|
fi;;
|
|
|
|
|
- SunOS/5*) case $CC in
|
|
|
|
|
+ SunOS/5*) case gcc in
|
|
|
|
|
*gcc*)
|
|
|
|
|
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
|
|
|
|
|
then
|
|
|
|
|
Index: setup.py
|
|
|
|
|
--- setup.py.orig 2006-08-10 01:42:18 +0200
|
|
|
|
|
+++ setup.py 2006-10-11 09:30:42 +0200
|
|
|
|
|
@@ -244,8 +244,8 @@
|
|
|
|
|
|
|
|
|
|
def detect_modules(self):
|
|
|
|
|
# Ensure that /usr/local is always used
|
|
|
|
|
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
|
|
|
|
|
- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
# Add paths specified in the environment variables LDFLAGS and
|
|
|
|
|
# CPPFLAGS for header and library files.
|
|
|
|
|
@@ -520,7 +520,7 @@
|
|
|
|
|
depends = ['socketmodule.h']) )
|
|
|
|
|
# Detect SSL support for the socket module (via _ssl)
|
|
|
|
|
search_for_ssl_incs_in = [
|
|
|
|
|
- '/usr/local/ssl/include',
|
|
|
|
|
+
|
|
|
|
|
'/usr/contrib/ssl/include/'
|
|
|
|
|
]
|
|
|
|
|
ssl_incs = find_file('openssl/ssl.h', inc_dirs,
|
|
|
|
|
@@ -532,7 +532,7 @@
|
|
|
|
|
if krb5_h:
|
|
|
|
|
ssl_incs += krb5_h
|
|
|
|
|
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
|
|
|
|
|
- ['/usr/local/ssl/lib',
|
|
|
|
|
+ [
|
|
|
|
|
'/usr/contrib/ssl/lib/'
|
|
|
|
|
] )
|
|
|
|
|
|
|
|
|
|
@@ -614,11 +614,11 @@
|
|
|
|
|
# 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/local/include/db3',
|
|
|
|
|
+
|
|
|
|
|
'/opt/sfw/include/db3',
|
|
|
|
|
'/sw/include/db3',
|
|
|
|
|
]
|
|
|
|
|
@@ -1223,6 +1223,7 @@
|
|
|
|
|
dotversion = dotversion[:-1] + '.' + dotversion[-1]
|
|
|
|
|
tcl_include_sub = []
|
|
|
|
|
tk_include_sub = []
|
|
|
|
|
+ dotversion = ''
|
|
|
|
|
for dir in inc_dirs:
|
|
|
|
|
tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
|
|
|
|
|
tk_include_sub += [dir + os.sep + "tk" + dotversion]
|
