gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-09 06:37:10 -08:00
Code Issues Projects Releases Wiki Activity

dev-cpp/libodb-sqlite: Move config.install.chroot="${D}" to src_install.

Browse Source 
Closes: https://bugs.gentoo.org/836044
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mark Wright <gienah@gentoo.org>
This commit is contained in:
Mark Wright
2022-03-27 11:23:52 +11:00
parent 3d03e75f4c
commit 8107eb8df7
2 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev-cpp/libodb-sqlite/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
+38
View File
@@ -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
dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild
+4 -3
View File
@@ -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
@@ -56,6 +56,7 @@ src_prepare() {
cd "${BS}" || die
eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
eapply "${FILESDIR}"/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
sed \
-e 's:libsqlite3[/]\?::' \
-i buildfile build/bootstrap.build \
@@ -97,7 +98,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}
@@ -113,5 +113,6 @@ src_test() {
}
src_install() {
b install
b install \
config.install.chroot="${D}"
}