diff options
Diffstat (limited to 'dev-cpp/libodb')
4 files changed, 155 insertions, 3 deletions
diff --git a/dev-cpp/libodb/Manifest b/dev-cpp/libodb/Manifest index b7102edd0e66..8d523e99383f 100644 --- a/dev-cpp/libodb/Manifest +++ b/dev-cpp/libodb/Manifest @@ -1,2 +1,4 @@ DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33 SHA512 0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4 +DIST build2-toolchain-0.14.0.tar.xz 4687616 BLAKE2B 98b2ec93c18027cbb3294650b3ad5d3dc97c1f06a6580437eac2db0297d3517cf327179f3a7c6efc611bffed5d028a034382d408ca58a976311d50a26534323c SHA512 d238a4ddfce8506b51b3b775738e818e7e0b36961a09ae0912c0c8688057b8393afebd4c0a28c6e6827c2e72ad5b82bc5e1231f798a66c2bb86b2b1e4ece73ef DIST libodb-2.5.0-b.19.tar.gz 101239 BLAKE2B d6c32e4e5bbacafbecf9e992f91604dac4bb50359d41709b81116f09ce805cd2a3388cf14b47acc60d9b5a52867de0725c1dbbc7603dda8ffaf64589b3057ecb SHA512 0a3e70afd2c2ba573676e1a2630986215b4c8e57a004f7d2f2227f301b6c58f739397a0efc8877902baf88b93aff83c9b67c9f5b5e87cc570d64bb76b7b8f66b +DIST libodb-2.5.0-b.21.tar.gz 101775 BLAKE2B 5417c5dd4540ab6014005803ec505e9dfc8f30125f573bac045306470eb8947fe800717fc02d8af138f7dd50bb82d19f01099f28421733809ccd1858bdc0f941 SHA512 68fa486b3a6f1254fb57e480bdf8e1d008fe38f29c47d5a4648ff44dc964dd7f3ee9d07510d742db15120f272aa6152bf08ca9d7689e4b34b0f5e5910ea71c0e diff --git a/dev-cpp/libodb/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch b/dev-cpp/libodb/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-cpp/libodb/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 diff --git a/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild b/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild index df3cbb7b3e1e..32154f060860 100644 --- a/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild +++ b/dev-cpp/libodb/libodb-2.5.0_beta19.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 @@ -45,6 +45,7 @@ b() { src_prepare() { pushd "${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 printf 'cxx.libs += %s\ncxx.poptions += %s\n' \ "-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \ "$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \ @@ -91,7 +92,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} @@ -107,5 +107,6 @@ src_test() { } src_install() { - b install + b install \ + config.install.chroot="${D}" } diff --git a/dev-cpp/libodb/libodb-2.5.0_beta21.ebuild b/dev-cpp/libodb/libodb-2.5.0_beta21.ebuild new file mode 100644 index 000000000000..3556b3eb4d7c --- /dev/null +++ b/dev-cpp/libodb/libodb-2.5.0_beta21.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)" + +BUILD2_PN=build2-toolchain +BUILD2_PV="0.14.0" +BUILD2_P="${BUILD2_PN}-${BUILD2_PV}" + +inherit toolchain-funcs multiprocessing +SRC_URI="https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz + https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz" +KEYWORDS="~amd64 ~x86" +DESCRIPTION="Common ODB runtime library" +HOMEPAGE="https://codesynthesis.com/products/odb/" + +LICENSE="|| ( Code-Synthesis-ODB GPL-2 )" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=" +" +BDEPEND="virtual/pkgconfig" +RDEPEND="${DEPEND} + !<dev-util/build2-0.14.0 +" + +BS="${WORKDIR}/${BUILD2_P}" +S="${WORKDIR}/${MY_P}" + +b() { + local myargs=( + --jobs $(makeopts_jobs) + --verbose 3 + ) + export LD_LIBRARY_PATH="${BS}/libbutl/libbutl:${BS}/build2/libbuild2:${BS}/build2/libbuild2/bash:${BS}/build2/libbuild2/in:${BS}/build2/libbuild2/bin:${BS}/build2/libbuild2/c:${BS}/build2/libbuild2/cc:${BS}/build2/libbuild2/cxx:${BS}/build2/libbuild2/version:${BS}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}" + set -- "${BS}"/build2/build2/b-boot "${@}" "${myargs[@]}" + echo "${@}" + "${@}" || die "${@} failed" +} + +src_prepare() { + pushd "${BS}" || die + eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch + printf 'cxx.libs += %s\ncxx.poptions += %s\n' \ + "-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \ + "$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \ + libodb-sqlite/buildfile \ + || die + sed \ + -e 's:libsqlite3[/]\?::' \ + -i buildfile build/bootstrap.build \ + || die + + if has_version dev-util/pkgconf; then + for i in build2/build2/buildfile build2/libbuild2/buildfile; do + printf 'cxx.libs += %s\ncxx.poptions += %s\n' \ + "$($(tc-getPKG_CONFIG) libpkgconf --libs)" \ + "$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \ + "${i}" \ + || die + done + sed \ + -e 's:libpkgconf[/]\?::' \ + -i buildfile build/bootstrap.build \ + || die + fi + popd || die + + default +} + +src_configure() { + pushd "${BS}" || die + emake -C build2 -f bootstrap.gmake \ + CXX=$(tc-getCXX) \ + CXXFLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS}" + popd || die + + b configure \ + config.cxx="$(tc-getCXX)" \ + config.cxx.coptions="${CXXFLAGS}" \ + config.cxx.loptions="${LDFLAGS}" \ + config.c="$(tc-getCC)" \ + config.cc.coptions="${CFLAGS}" \ + config.cc.loptions="${LDFLAGS}" \ + config.bin.ar="$(tc-getAR)" \ + config.bin.ranlib="$(tc-getRANLIB)" \ + config.bin.lib=shared \ + config.install.root="${EPREFIX}"/usr \ + config.install.lib="${EPREFIX}"/usr/$(get_libdir) \ + config.install.doc="${EPREFIX}"/usr/share/doc/${PF} +} + +src_compile() { + b update-for-install + use test && b update-for-test +} + +src_test() { + b test +} + +src_install() { + b install \ + config.install.chroot="${D}" +} |