python.patch 4.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120
  1. Index: Include/code.h
  2. --- Include/code.h.orig 2006-05-23 12:37:38 +0200
  3. +++ Include/code.h 2006-11-03 19:29:53 +0100
  4. @@ -52,7 +52,7 @@
  5. /* This should be defined if a future statement modifies the syntax.
  6. For example, when a keyword is added.
  7. */
  8. -#define PY_PARSER_REQUIRES_FUTURE_KEYWORD
  9. +#undef PY_PARSER_REQUIRES_FUTURE_KEYWORD
  10. #define CO_MAXBLOCKS 20 /* Max static block nesting within a function */
  11. Index: Include/pyport.h
  12. --- Include/pyport.h.orig 2006-06-10 14:23:46 +0200
  13. +++ Include/pyport.h 2006-11-03 19:29:10 +0100
  14. @@ -370,8 +370,12 @@
  15. * config to #define Py_HUGE_VAL to something that works on your platform.
  16. */
  17. #ifndef Py_HUGE_VAL
  18. +#if defined (__SVR4) && defined (__sun)
  19. +#define Py_HUGE_VAL HUGE
  20. +#else
  21. #define Py_HUGE_VAL HUGE_VAL
  22. #endif
  23. +#endif
  24. /* Py_OVERFLOWED(X)
  25. * Return 1 iff a libm function overflowed. Set errno to 0 before calling
  26. Index: Modules/_ctypes/libffi/configure
  27. --- Modules/_ctypes/libffi/configure.orig 2006-08-14 18:17:41 +0200
  28. +++ Modules/_ctypes/libffi/configure 2006-11-03 19:29:10 +0100
  29. @@ -3516,7 +3516,7 @@
  30. cris-*-*) TARGET=LIBFFI_CRIS; TARGETDIR=cris;;
  31. s390-*-linux-*) TARGET=S390; TARGETDIR=s390;;
  32. s390x-*-linux-*) TARGET=S390; TARGETDIR=s390;;
  33. -x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
  34. +x86_64-*-linux* | amd64-*-freebsd* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
  35. sh-*-linux* | sh[34]*-*-linux*) TARGET=SH; TARGETDIR=sh;;
  36. sh-*-rtems*) TARGET=SH; TARGETDIR=sh;;
  37. sh64-*-linux* | sh5*-*-linux*) TARGET=SH64; TARGETDIR=sh64;;
  38. Index: configure
  39. --- configure.orig 2006-09-05 04:54:42 +0200
  40. +++ configure 2006-11-03 19:29:10 +0100
  41. @@ -3800,11 +3800,11 @@
  42. # debug builds.
  43. OPT="-g -Wall $STRICT_PROTO"
  44. else
  45. - OPT="-g -O3 -Wall $STRICT_PROTO"
  46. + OPT="-g -O2 -Wall $STRICT_PROTO"
  47. fi
  48. ;;
  49. *)
  50. - OPT="-O3 -Wall $STRICT_PROTO"
  51. + OPT="-O2 -Wall $STRICT_PROTO"
  52. ;;
  53. esac
  54. case $ac_sys_system in
  55. @@ -11136,7 +11136,7 @@
  56. then
  57. LINKFORSHARED="-Wl,--export-dynamic"
  58. fi;;
  59. - SunOS/5*) case $CC in
  60. + SunOS/5*) case gcc in
  61. *gcc*)
  62. if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
  63. then
  64. Index: setup.py
  65. --- setup.py.orig 2006-08-10 01:42:18 +0200
  66. +++ setup.py 2006-11-03 19:29:10 +0100
  67. @@ -244,8 +244,8 @@
  68. def detect_modules(self):
  69. # Ensure that /usr/local is always used
  70. - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
  71. - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
  72. +
  73. +
  74. # Add paths specified in the environment variables LDFLAGS and
  75. # CPPFLAGS for header and library files.
  76. @@ -520,8 +520,6 @@
  77. depends = ['socketmodule.h']) )
  78. # Detect SSL support for the socket module (via _ssl)
  79. search_for_ssl_incs_in = [
  80. - '/usr/local/ssl/include',
  81. - '/usr/contrib/ssl/include/'
  82. ]
  83. ssl_incs = find_file('openssl/ssl.h', inc_dirs,
  84. search_for_ssl_incs_in
  85. @@ -532,8 +530,7 @@
  86. if krb5_h:
  87. ssl_incs += krb5_h
  88. ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
  89. - ['/usr/local/ssl/lib',
  90. - '/usr/contrib/ssl/lib/'
  91. + [
  92. ] )
  93. if (ssl_incs is not None and
  94. @@ -614,11 +611,9 @@
  95. # top of the normal inc_dirs.
  96. db_inc_paths = [
  97. '/usr/include/db4',
  98. - '/usr/local/include/db4',
  99. '/opt/sfw/include/db4',
  100. '/sw/include/db4',
  101. '/usr/include/db3',
  102. - '/usr/local/include/db3',
  103. '/opt/sfw/include/db3',
  104. '/sw/include/db3',
  105. ]
  106. @@ -1223,6 +1218,7 @@
  107. dotversion = dotversion[:-1] + '.' + dotversion[-1]
  108. tcl_include_sub = []
  109. tk_include_sub = []
  110. + dotversion = ''
  111. for dir in inc_dirs:
  112. tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
  113. tk_include_sub += [dir + os.sep + "tk" + dotversion]