Gentoo Archives: gentoo-commits

From: "Sergey Popov (pinkbyte)" <pinkbyte@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/boost-build/files: boost-build-1.54.0-support_dots_in_python-buildid.patch boost-build-1.54.0-fix-test.patch
Date: Tue, 27 Aug 2013 08:46:05
Message-Id: 20130827084600.65F4F2004E@flycatcher.gentoo.org
1 pinkbyte 13/08/27 08:46:00
2
3 Added:
4 boost-build-1.54.0-support_dots_in_python-buildid.patch
5 boost-build-1.54.0-fix-test.patch
6 Log:
7 Version bump, wrt bug #475712
8
9 (Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
10
11 Revision Changes Path
12 1.1 dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch?rev=1.1&content-type=text/plain
16
17 Index: boost-build-1.54.0-support_dots_in_python-buildid.patch
18 ===================================================================
19 --- tools/common.jam.orig 2013-08-27 12:13:56.865158748 +0400
20 +++ tools/common.jam 2013-08-27 12:15:08.760162210 +0400
21 @@ -763,7 +763,15 @@
22 switch $(f:G)
23 {
24 case <base> :
25 - result += $(name:B) ;
26 + local matched = [ MATCH "^(boost.*python)-.*" : $(name) ] ;
27 + if $(matched) = boost_python || $(matched) = boost_mpi_python
28 + {
29 + result += $(name) ;
30 + }
31 + else
32 + {
33 + result += $(name:B) ;
34 + }
35
36 case <toolset> :
37 result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) :
38
39
40
41 1.1 dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch?rev=1.1&content-type=text/plain
45
46 Index: boost-build-1.54.0-fix-test.patch
47 ===================================================================
48 --- test/startup_v2.py.orig 2013-08-27 12:23:10.520185408 +0400
49 +++ test/startup_v2.py 2013-08-27 12:23:27.155186209 +0400
50 @@ -50,7 +50,7 @@
51 return re.match(expected, actual, re.DOTALL) != None
52
53
54 -t = BoostBuild.Tester(match=match_re, boost_build_path="", pass_toolset=0)
55 +t = BoostBuild.Tester(match=match_re, boost_build_path="/invalid/location", pass_toolset=0)
56 t.set_tree("startup")
57 check_for_existing_boost_build_jam(t)