1 |
commit: bca9878b581b1d4a7439f51ebb8d4a8755bcefca |
2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 10 09:28:16 2021 +0000 |
4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 10 09:28:51 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=bca9878b |
7 |
|
8 |
dev-util/boost-build: add missing patches and files. |
9 |
|
10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.1 |
11 |
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> |
12 |
|
13 |
dev-util/boost-build/files/boost-build-1.71.0-fix-test.patch | 11 +++++++++++ |
14 |
.../files/boost-build-1.71.0-respect-c_ld-flags.patch | 9 +++++++++ |
15 |
dev-util/boost-build/files/site-config.jam | 11 +++++++++++ |
16 |
3 files changed, 31 insertions(+) |
17 |
|
18 |
diff --git a/dev-util/boost-build/files/boost-build-1.71.0-fix-test.patch b/dev-util/boost-build/files/boost-build-1.71.0-fix-test.patch |
19 |
new file mode 100644 |
20 |
index 000000000..3f8b177c7 |
21 |
--- /dev/null |
22 |
+++ b/dev-util/boost-build/files/boost-build-1.71.0-fix-test.patch |
23 |
@@ -0,0 +1,11 @@ |
24 |
+--- a/test/startup_v2.py |
25 |
++++ b/test/startup_v2.py |
26 |
+@@ -50,7 +50,7 @@ |
27 |
+ return re.match(expected, actual, re.DOTALL) != None |
28 |
+ |
29 |
+ |
30 |
+-t = BoostBuild.Tester(match=match_re, boost_build_path="", pass_toolset=0) |
31 |
++t = BoostBuild.Tester(match=match_re, boost_build_path="/invalid/location", pass_toolset=0) |
32 |
+ t.set_tree("startup") |
33 |
+ check_for_existing_boost_build_jam(t) |
34 |
+ |
35 |
|
36 |
diff --git a/dev-util/boost-build/files/boost-build-1.71.0-respect-c_ld-flags.patch b/dev-util/boost-build/files/boost-build-1.71.0-respect-c_ld-flags.patch |
37 |
new file mode 100644 |
38 |
index 000000000..f51abea61 |
39 |
--- /dev/null |
40 |
+++ b/dev-util/boost-build/files/boost-build-1.71.0-respect-c_ld-flags.patch |
41 |
@@ -0,0 +1,9 @@ |
42 |
+--- a/engine/build.sh |
43 |
++++ b/engine/build.sh |
44 |
+@@ -439,5 +439,5 @@ |
45 |
+ if check_debug_build "$@" ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG}" |
46 |
+ else B2_CXXFLAGS="${B2_CXXFLAGS_RELEASE} -DNDEBUG" |
47 |
+ fi |
48 |
+-echo_run ${B2_CXX} ${CXXFLAGS} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2 |
49 |
++echo_run ${B2_CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2 |
50 |
+ echo_run cp b2 bjam |
51 |
|
52 |
diff --git a/dev-util/boost-build/files/site-config.jam b/dev-util/boost-build/files/site-config.jam |
53 |
new file mode 100644 |
54 |
index 000000000..50002cf15 |
55 |
--- /dev/null |
56 |
+++ b/dev-util/boost-build/files/site-config.jam |
57 |
@@ -0,0 +1,11 @@ |
58 |
+# Copyright 1999-2021 Gentoo Authors |
59 |
+# Distributed under the Boost Software License, Version 1.0. |
60 |
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) |
61 |
+ |
62 |
+# Define two new variants to be used when building boost (or separate boost-libs) |
63 |
+# on Gentoo. The two variants make use of Gentoo-specific optimization and debug-symbols |
64 |
+# values "none" which are not part of the official boost distribution. |
65 |
+# DO NOT RELY ON THE FOLLOWING VARIANTS TO BE PRESENT ON OTHER OS! |
66 |
+variant gentoorelease : release : <optimization>none <debug-symbols>none <runtime-link>shared ; |
67 |
+variant gentoodebug : debug : <optimization>none <debug-symbols>on <runtime-link>shared ; |
68 |
+ |