python30.patch 2.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990
  1. Index: configure
  2. --- configure.orig 2008-09-07 21:19:04 +0200
  3. +++ configure 2008-10-02 18:39:15 +0200
  4. @@ -3098,9 +3098,9 @@
  5. CFLAGS=$ac_save_CFLAGS
  6. elif test $ac_cv_prog_cc_g = yes; then
  7. if test "$GCC" = yes; then
  8. - CFLAGS="-g -O2"
  9. + CFLAGS="-O2"
  10. else
  11. - CFLAGS="-g"
  12. + CFLAGS=""
  13. fi
  14. else
  15. if test "$GCC" = yes; then
  16. @@ -4530,7 +4530,7 @@
  17. # debug builds.
  18. OPT="-g -Wall $STRICT_PROTO"
  19. else
  20. - OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
  21. + OPT="$WRAP -O3 -Wall $STRICT_PROTO"
  22. fi
  23. ;;
  24. *)
  25. @@ -13198,7 +13198,7 @@
  26. then
  27. LINKFORSHARED="-Wl,--export-dynamic"
  28. fi;;
  29. - SunOS/5*) case $CC in
  30. + SunOS/5*) case gcc in
  31. *gcc*)
  32. if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
  33. then
  34. Index: setup.py
  35. --- setup.py.orig 2008-09-30 02:15:45 +0200
  36. +++ setup.py 2008-10-02 18:44:21 +0200
  37. @@ -310,8 +310,8 @@
  38. def detect_modules(self):
  39. # Ensure that /usr/local is always used
  40. - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
  41. - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
  42. +
  43. +
  44. # Add paths specified in the environment variables LDFLAGS and
  45. # CPPFLAGS for header and library files.
  46. @@ -612,8 +612,6 @@
  47. depends = ['socketmodule.h']) )
  48. # Detect SSL support for the socket module (via _ssl)
  49. search_for_ssl_incs_in = [
  50. - '/usr/local/ssl/include',
  51. - '/usr/contrib/ssl/include/'
  52. ]
  53. ssl_incs = find_file('openssl/ssl.h', inc_dirs,
  54. search_for_ssl_incs_in
  55. @@ -624,8 +622,7 @@
  56. if krb5_h:
  57. ssl_incs += krb5_h
  58. ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
  59. - ['/usr/local/ssl/lib',
  60. - '/usr/contrib/ssl/lib/'
  61. + [
  62. ] )
  63. if (ssl_incs is not None and
  64. @@ -740,14 +737,8 @@
  65. # top of the normal inc_dirs.
  66. db_inc_paths = [
  67. '/usr/include/db4',
  68. - '/usr/local/include/db4',
  69. '/opt/sfw/include/db4',
  70. - '/usr/include/db3',
  71. - '/usr/local/include/db3',
  72. - '/opt/sfw/include/db3',
  73. - # Fink defaults (http://fink.sourceforge.net/)
  74. '/sw/include/db4',
  75. - '/sw/include/db3',
  76. ]
  77. # 4.x minor number specific paths
  78. for x in gen_db_minor_ver_nums(4):
  79. @@ -1537,6 +1528,7 @@
  80. dotversion = dotversion[:-1] + '.' + dotversion[-1]
  81. tcl_include_sub = []
  82. tk_include_sub = []
  83. + dotversion = ''
  84. for dir in inc_dirs:
  85. tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
  86. tk_include_sub += [dir + os.sep + "tk" + dotversion]