[gentoo-commits] repo/gentoo:master commit in: dev-util/build2/files/, dev-util/build2/

[Mark Wright]

commit:     4e0bb5a3aa56669cd76e6c22deda9d8c7b1cf15c
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 00:22:40 2022 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 00:23:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e0bb5a3

dev-util/build2: Move config.install.chroot="${D}" to src_install.

Closes: https://bugs.gentoo.org/836063
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mark Wright <gienah <AT> gentoo.org>

 dev-util/build2/build2-0.13.0.ebuild               |  7 ++--
 ...mol-vtable-for-match_any_but_newline-exec.patch | 38 ++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/dev-util/build2/build2-0.13.0.ebuild 
b/dev-util/build2/build2-0.13.0.ebuild
index e5b6999ee800..be9a2ab78a0a 100644
--- a/dev-util/build2/build2-0.13.0.ebuild
+++ b/dev-util/build2/build2-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-0.13.0_alpha0_pre20200710-nousrlocal.patch
+       
"${FILESDIR}"/${PN}-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -104,7 +105,6 @@ src_configure() {
                config.bin.ar="$(tc-getAR)" \
                config.bin.ranlib="$(tc-getRANLIB)" \
                config.bin.lib=shared \
-               config.install.chroot="${D}" \
                config.install.root="${EPREFIX}"/usr \
                config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
                config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
@@ -120,7 +120,8 @@ src_test() {
 }
 
 src_install() {
-       b install
+       b install \
+               config.install.chroot="${D}"
        mkdir -p "${ED}"/usr/share/doc/${PF}/html || die
        mv -f "${ED}"/usr/share/doc/${PF}/*.xhtml 
"${ED}"/usr/share/doc/${PF}/html || die
 }

diff --git 
a/dev-util/build2/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
 
b/dev-util/build2/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
new file mode 100644
index 000000000000..00b685600c8e
--- /dev/null
+++ 
b/dev-util/build2/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
@@ -0,0 +1,38 @@
+--- build2-toolchain-0.13.0-orig/build2/libbuild2/script/regex.cxx     
2020-06-10 19:25:37.000000000 +1000
++++ build2-toolchain-0.13.0/build2/libbuild2/script/regex.cxx  2020-08-10 
14:00:05.698012838 +1000
+@@ -5,6 +5,35 @@
+ 
+ #include <libbuild2/script/regex.hxx>
+ 
++#if defined(_LIBCPP_VERSION)
++template <>
++void
++std::__1::__match_any_but_newline<build2::script::regex::line_char>::__exec(__state&
 __s) const
++{
++  if (__s.__current_ != __s.__last_)
++  {
++    switch (*__s.__current_)
++    {
++      case '\r':
++      case '\n':
++        __s.__do_ = __state::__reject;
++        __s.__node_ = nullptr;
++        break;
++      default:
++        __s.__do_ = __state::__accept_and_consume;
++        ++__s.__current_;
++        __s.__node_ = this->first();
++        break;
++    }
++  }
++  else
++  {
++    __s.__do_ = __state::__reject;
++    __s.__node_ = nullptr;
++  }
++}
++#endif
++
+ using namespace std;
+ 
+ namespace build2