boost.patch 2.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091
  1. Index: tools/build/v1/boost-base.jam
  2. --- tools/build/v1/boost-base.jam.orig 2005-07-30 17:55:37 +0200
  3. +++ tools/build/v1/boost-base.jam 2005-08-13 10:22:58 +0200
  4. @@ -2692,10 +2692,8 @@
  5. version-tag = $(version-tag:J="_") ;
  6. }
  7. - tags += $(toolset-tag:J=) ;
  8. tags += $(thread-tag:J=) ;
  9. tags += $(runtime-tag:J=) ;
  10. - tags += $(version-tag) ;
  11. if $(tags)
  12. {
  13. Index: Jamfile
  14. --- Jamfile.orig 2005-02-27 18:28:08 +0100
  15. +++ Jamfile 2005-08-13 14:34:09 +0200
  16. @@ -64,15 +64,6 @@
  17. <library>. By default all libraries attempt to
  18. build.
  19. - --with-python-root[=PYTHON_ROOT]
  20. - Build Boost.Python libraries with the Python
  21. - devel packages located at PYTHON_ROOT.
  22. - Default PYTHON_ROOT; C:\\tools\\python on Win32.
  23. - Default PYTHON_ROOT; /usr/local on Unix, Linux, etc.
  24. - Default PYTHON_ROOT; /usr on Cygwin.
  25. -
  26. - --with-pydebug Build Boost.Python libraries using the
  27. - Python debug runtime.
  28. " ;
  29. EXIT "" ;
  30. }
  31. @@ -124,17 +115,6 @@
  32. local include-locate = [ MATCH "^--includedir=(.*)" : $(ARGV) ] ;
  33. include-locate ?= $(boost-locate)/include ;
  34. -# location of python
  35. -local python-root = [ MATCH "^--with-python-root=(.*)" : $(ARGV) ] ;
  36. -PYTHON_ROOT ?= $(python-root) ;
  37. -
  38. -# variant for pydebug build
  39. -local with-debug-python ;
  40. -if --with-pydebug in $(ARGV)
  41. -{
  42. - with-debug-python = debug-python ;
  43. -}
  44. -
  45. # libraries to disable building, etc.
  46. local without-libraries = [ MATCH "^--without-(.*)" : $(ARGV) ] ;
  47. @@ -144,9 +124,6 @@
  48. {
  49. switch $(arg)
  50. {
  51. - case --with-python-root=* : local _ ;
  52. - case --with-pydebug : local _ ;
  53. -
  54. case --with-* :
  55. with-libraries += [ MATCH "^--with-(.*)" : $(arg) ] ;
  56. }
  57. @@ -155,9 +132,6 @@
  58. #
  59. project-root ;
  60. -# bring in the rules for python
  61. -import python ;
  62. -
  63. #
  64. local version-tag = [ MATCH "^([^.]+).([^.]+)" : $(BOOST_VERSION) ] ;
  65. version-tag = $(version-tag:J="_") ;
  66. @@ -176,7 +150,6 @@
  67. local lib-build =
  68. debug release
  69. - [ cond $(with-debug-python) : debug-python ]
  70. [ cond $(NT) : <runtime-link>static/dynamic ]
  71. <threading>single/multi
  72. ;
  73. Index: status/Jamfile
  74. --- status/Jamfile.orig 2005-06-23 11:57:18 +0200
  75. +++ status/Jamfile 2005-08-13 14:35:31 +0200
  76. @@ -44,7 +44,6 @@
  77. subinclude libs/program_options/test ; # test-suite program_options
  78. subinclude libs/property_map/test ; # test-suite property_map
  79. subinclude libs/ptr_container/test ; # test-suite ptr_container
  80. -subinclude libs/python/test ; # test-suite python
  81. subinclude libs/random/test ; # test-suite random
  82. subinclude libs/range/test ; # test-suite range
  83. subinclude libs/regex/test ; # test-suite regex