aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenda Xu <heroxbd@gentoo.org>2021-02-10 17:28:16 +0800
committerBenda Xu <heroxbd@gentoo.org>2021-02-10 17:28:51 +0800
commitbca9878b581b1d4a7439f51ebb8d4a8755bcefca (patch)
tree4eeaa3f1000ebace113f094757910061c07b5070 /dev-util
parentdev-util/boost-build: fix patches. (diff)
downloadsci-bca9878b581b1d4a7439f51ebb8d4a8755bcefca.tar.gz
sci-bca9878b581b1d4a7439f51ebb8d4a8755bcefca.tar.bz2
sci-bca9878b581b1d4a7439f51ebb8d4a8755bcefca.zip
dev-util/boost-build: add missing patches and files.
Package-Manager: Portage-3.0.14, Repoman-3.0.1 Signed-off-by: Benda Xu <heroxbd@gentoo.org>
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/boost-build/files/boost-build-1.71.0-fix-test.patch11
-rw-r--r--dev-util/boost-build/files/boost-build-1.71.0-respect-c_ld-flags.patch9
-rw-r--r--dev-util/boost-build/files/site-config.jam11
3 files changed, 31 insertions, 0 deletions
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
new file mode 100644
index 000000000..3f8b177c7
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.71.0-fix-test.patch
@@ -0,0 +1,11 @@
+--- a/test/startup_v2.py
++++ b/test/startup_v2.py
+@@ -50,7 +50,7 @@
+ return re.match(expected, actual, re.DOTALL) != None
+
+
+-t = BoostBuild.Tester(match=match_re, boost_build_path="", pass_toolset=0)
++t = BoostBuild.Tester(match=match_re, boost_build_path="/invalid/location", pass_toolset=0)
+ t.set_tree("startup")
+ check_for_existing_boost_build_jam(t)
+
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
new file mode 100644
index 000000000..f51abea61
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.71.0-respect-c_ld-flags.patch
@@ -0,0 +1,9 @@
+--- a/engine/build.sh
++++ b/engine/build.sh
+@@ -439,5 +439,5 @@
+ if check_debug_build "$@" ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG}"
+ else B2_CXXFLAGS="${B2_CXXFLAGS_RELEASE} -DNDEBUG"
+ fi
+-echo_run ${B2_CXX} ${CXXFLAGS} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2
++echo_run ${B2_CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2
+ echo_run cp b2 bjam
diff --git a/dev-util/boost-build/files/site-config.jam b/dev-util/boost-build/files/site-config.jam
new file mode 100644
index 000000000..50002cf15
--- /dev/null
+++ b/dev-util/boost-build/files/site-config.jam
@@ -0,0 +1,11 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
+
+# Define two new variants to be used when building boost (or separate boost-libs)
+# on Gentoo. The two variants make use of Gentoo-specific optimization and debug-symbols
+# values "none" which are not part of the official boost distribution.
+# DO NOT RELY ON THE FOLLOWING VARIANTS TO BE PRESENT ON OTHER OS!
+variant gentoorelease : release : <optimization>none <debug-symbols>none <runtime-link>shared ;
+variant gentoodebug : debug : <optimization>none <debug-symbols>on <runtime-link>shared ;
+