| 1 |
commit: 4e0bb5a3aa56669cd76e6c22deda9d8c7b1cf15c |
| 2 |
Author: Mark Wright <gienah <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Mar 27 00:22:40 2022 +0000 |
| 4 |
Commit: Mark Wright <gienah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 27 00:23:52 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e0bb5a3 |
| 7 |
|
| 8 |
dev-util/build2: Move config.install.chroot="${D}" to src_install. |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/836063 |
| 11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 12 |
Signed-off-by: Mark Wright <gienah <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-util/build2/build2-0.13.0.ebuild | 7 ++-- |
| 15 |
...mol-vtable-for-match_any_but_newline-exec.patch | 38 ++++++++++++++++++++++ |
| 16 |
2 files changed, 42 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-util/build2/build2-0.13.0.ebuild b/dev-util/build2/build2-0.13.0.ebuild |
| 19 |
index e5b6999ee800..be9a2ab78a0a 100644 |
| 20 |
--- a/dev-util/build2/build2-0.13.0.ebuild |
| 21 |
+++ b/dev-util/build2/build2-0.13.0.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2020 Gentoo Authors |
| 24 |
+# Copyright 1999-2022 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=7 |
| 28 |
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}" |
| 29 |
|
| 30 |
PATCHES=( |
| 31 |
"${FILESDIR}"/${PN}-0.13.0_alpha0_pre20200710-nousrlocal.patch |
| 32 |
+ "${FILESDIR}"/${PN}-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch |
| 33 |
) |
| 34 |
|
| 35 |
S="${WORKDIR}/${MY_P}" |
| 36 |
@@ -104,7 +105,6 @@ src_configure() { |
| 37 |
config.bin.ar="$(tc-getAR)" \ |
| 38 |
config.bin.ranlib="$(tc-getRANLIB)" \ |
| 39 |
config.bin.lib=shared \ |
| 40 |
- config.install.chroot="${D}" \ |
| 41 |
config.install.root="${EPREFIX}"/usr \ |
| 42 |
config.install.lib="${EPREFIX}"/usr/$(get_libdir) \ |
| 43 |
config.install.doc="${EPREFIX}"/usr/share/doc/${PF} |
| 44 |
@@ -120,7 +120,8 @@ src_test() { |
| 45 |
} |
| 46 |
|
| 47 |
src_install() { |
| 48 |
- b install |
| 49 |
+ b install \ |
| 50 |
+ config.install.chroot="${D}" |
| 51 |
mkdir -p "${ED}"/usr/share/doc/${PF}/html || die |
| 52 |
mv -f "${ED}"/usr/share/doc/${PF}/*.xhtml "${ED}"/usr/share/doc/${PF}/html || die |
| 53 |
} |
| 54 |
|
| 55 |
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 |
| 56 |
new file mode 100644 |
| 57 |
index 000000000000..00b685600c8e |
| 58 |
--- /dev/null |
| 59 |
+++ b/dev-util/build2/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch |
| 60 |
@@ -0,0 +1,38 @@ |
| 61 |
+--- build2-toolchain-0.13.0-orig/build2/libbuild2/script/regex.cxx 2020-06-10 19:25:37.000000000 +1000 |
| 62 |
++++ build2-toolchain-0.13.0/build2/libbuild2/script/regex.cxx 2020-08-10 14:00:05.698012838 +1000 |
| 63 |
+@@ -5,6 +5,35 @@ |
| 64 |
+ |
| 65 |
+ #include <libbuild2/script/regex.hxx> |
| 66 |
+ |
| 67 |
++#if defined(_LIBCPP_VERSION) |
| 68 |
++template <> |
| 69 |
++void |
| 70 |
++std::__1::__match_any_but_newline<build2::script::regex::line_char>::__exec(__state& __s) const |
| 71 |
++{ |
| 72 |
++ if (__s.__current_ != __s.__last_) |
| 73 |
++ { |
| 74 |
++ switch (*__s.__current_) |
| 75 |
++ { |
| 76 |
++ case '\r': |
| 77 |
++ case '\n': |
| 78 |
++ __s.__do_ = __state::__reject; |
| 79 |
++ __s.__node_ = nullptr; |
| 80 |
++ break; |
| 81 |
++ default: |
| 82 |
++ __s.__do_ = __state::__accept_and_consume; |
| 83 |
++ ++__s.__current_; |
| 84 |
++ __s.__node_ = this->first(); |
| 85 |
++ break; |
| 86 |
++ } |
| 87 |
++ } |
| 88 |
++ else |
| 89 |
++ { |
| 90 |
++ __s.__do_ = __state::__reject; |
| 91 |
++ __s.__node_ = nullptr; |
| 92 |
++ } |
| 93 |
++} |
| 94 |
++#endif |
| 95 |
++ |
| 96 |
+ using namespace std; |
| 97 |
+ |
| 98 |
+ namespace build2 |
Archives