Skip to content

Commit 6a3085a

Browse files
committed
Merging some of the more obvious changes from RC_1_34_0 [SVN r40714]
2 parents 190d0d7 + 71f54cc commit 6a3085a

18 files changed

+1066
-414
lines changed

build/Jamfile.v2

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,20 @@ import modules ;
77

88
import python ;
99

10+
if ! [ python.configured ] && ! ( --without-python in [ modules.peek : ARGV ] )
11+
{
12+
# Attempt default configuration of python
13+
import toolset : using ;
14+
using python ;
15+
16+
if ! [ python.configured ]
17+
{
18+
ECHO "WARNING: No python installation configured and autoconfiguration" ;
19+
ECHO " failed. See http://www.boost.org/libs/python/doc/building.html" ;
20+
ECHO " for configuration instructions or pass --without-python to" ;
21+
ECHO " suppress this message and silently skip all Boost.Python targets" ;
22+
}
23+
}
1024

1125
project boost/python
1226
: source-location ../src
@@ -25,7 +39,6 @@ lib boost_python
2539
str.cpp
2640
slice.cpp
2741

28-
aix_init_module.cpp
2942
converter/from_python.cpp
3043
converter/registry.cpp
3144
converter/type_id.cpp
@@ -69,12 +82,13 @@ lib boost_python
6982
# as it's not possible anyway, and to cause dependents to
7083
# fail to build
7184
[ unless [ python.configured ] : <build>no ]
72-
85+
86+
<python-debugging>on:<define>BOOST_DEBUG_PYTHON
7387
: # default build
7488
<link>shared
7589
: # usage requirements
76-
<link>static:<define>BOOST_PYTHON_STATIC_LIB
77-
<link>shared:<define>BOOST_PYTHON_DYNAMIC_LIB
90+
<link>static:<define>BOOST_PYTHON_STATIC_LIB
91+
<python-debugging>on:<define>BOOST_DEBUG_PYTHON
7892
;
7993

8094
boost-install boost_python ;

doc/building.html

Lines changed: 361 additions & 140 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)