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