Skip to content

Commit 234b64b

Browse files
committed
Fix args error in pyton config when ldd errors.
1 parent 0447761 commit 234b64b

4 files changed

Lines changed: 10 additions & 3 deletions

File tree

doc/src/history.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
[[b2.history]]
22
= History
33

4+
== Version 5.1.1
5+
6+
Fix python config error when `ldd --version` fails instead of resulting in not
7+
detecting `glibc` for the Python configuration.
8+
49
== Version 5.5.0
510

611
This release has a bunch of internal cleanups and bug fixes. But it also has a

src/build/version.jam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import numbers ;
1010
# Mirror engine JAM_VERSION
1111
.major = 5 ;
1212
.minor = 5 ;
13-
.patch = 0 ;
13+
.patch = 1 ;
1414

1515

1616
rule build ( )

src/engine/patchlevel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ Distributed under the Boost Software License, Version 1.0.
1414

1515
#define VERSION_MAJOR 5
1616
#define VERSION_MINOR 5
17-
#define VERSION_PATCH 0
17+
#define VERSION_PATCH 1

src/tools/python.jam

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,9 @@ local rule gcc-use-libutil ( )
631631
{
632632
# Use ldd to determine the libc version, assuming
633633
# that GNU ldd has the same version than libc
634-
local output = [ SPLIT_BY_CHARACTERS [ shell-cmd $(ldd)" --version" ] : "\r\n" ] ;
634+
local ldd_version = [ shell-cmd $(ldd)" --version" ] ;
635+
ldd_version ?= "" ;
636+
local output = [ SPLIT_BY_CHARACTERS $(ldd_version) : "\r\n" ] ;
635637
debug-message found ldd '$(output[1])' ;
636638
glibc = [ MATCH "([0-9.]+)$" : $(output[1]) ] ;
637639
if $(glibc)

0 commit comments

Comments
 (0)