From 696d1bbadddd2fa3c3aeded11b85771493a116c3 Mon Sep 17 00:00:00 2001 From: Mark Wright Date: Tue, 21 Jul 2020 20:41:04 +1000 Subject: [PATCH] dev-cpp/libodb: Add for dev-util/build2 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Mark Wright --- dev-cpp/libodb/Manifest | 2 + ...0.13.0_alpha0_pre20200710-nousrlocal.patch | 52 ++++++++ dev-cpp/libodb/libodb-2.5.0_beta19.ebuild | 111 ++++++++++++++++++ dev-cpp/libodb/metadata.xml | 20 ++++ 4 files changed, 185 insertions(+) create mode 100644 dev-cpp/libodb/Manifest create mode 100644 dev-cpp/libodb/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch create mode 100644 dev-cpp/libodb/libodb-2.5.0_beta19.ebuild create mode 100644 dev-cpp/libodb/metadata.xml diff --git a/dev-cpp/libodb/Manifest b/dev-cpp/libodb/Manifest new file mode 100644 index 0000000000000..b7102edd0e664 --- /dev/null +++ b/dev-cpp/libodb/Manifest @@ -0,0 +1,2 @@ +DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33 SHA512 0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4 +DIST libodb-2.5.0-b.19.tar.gz 101239 BLAKE2B d6c32e4e5bbacafbecf9e992f91604dac4bb50359d41709b81116f09ce805cd2a3388cf14b47acc60d9b5a52867de0725c1dbbc7603dda8ffaf64589b3057ecb SHA512 0a3e70afd2c2ba573676e1a2630986215b4c8e57a004f7d2f2227f301b6c58f739397a0efc8877902baf88b93aff83c9b67c9f5b5e87cc570d64bb76b7b8f66b diff --git a/dev-cpp/libodb/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch b/dev-cpp/libodb/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch new file mode 100644 index 0000000000000..c3717856b6b7c --- /dev/null +++ b/dev-cpp/libodb/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch @@ -0,0 +1,52 @@ +--- build2-toolchain-e135a3112b15c88f0601583ca068f8adea7b605d-orig/build2/libbuild2/cc/module.cxx 2020-07-10 20:12:57.000000000 +1000 ++++ build2-toolchain-e135a3112b15c88f0601583ca068f8adea7b605d/build2/libbuild2/cc/module.cxx 2020-07-14 14:33:58.939950579 +1000 +@@ -323,8 +323,6 @@ + + #ifndef _WIN32 + static const dir_path usr_inc ("/usr/include"); +- static const dir_path usr_loc_lib ("/usr/local/lib"); +- static const dir_path usr_loc_inc ("/usr/local/include"); + # ifdef __APPLE__ + static const dir_path a_usr_inc ( + "/Library/Developer/CommandLineTools/SDKs/MacOSX*.sdk/usr/include"); +@@ -486,7 +484,6 @@ + auto& ls (lib_dirs.first); + + bool ui (find (is.begin (), is.end (), usr_inc) != is.end ()); +- bool uli (find (is.begin (), is.end (), usr_loc_inc) != is.end ()); + + #ifdef __APPLE__ + // On Mac OS starting from 10.14 there is no longer /usr/include. +@@ -509,7 +506,7 @@ + // + // Is Apple's /usr/include. + // +- if (!ui && !uli) ++ if (!ui) + { + for (const dir_path& d: is) + { +@@ -521,22 +518,16 @@ + } + } + #endif +- if (ui || uli) ++ if (ui) + { +- bool ull (find (ls.begin (), ls.end (), usr_loc_lib) != ls.end ()); +- + // Many platforms don't search in /usr/local/lib by default (but do + // for headers in /usr/local/include). So add it as the last option. + // +- if (!ull && exists (usr_loc_lib, true /* ignore_error */)) +- ls.push_back (usr_loc_lib); + + // FreeBSD is at least consistent: it searches in neither. Quoting + // its wiki: "FreeBSD can't even find libraries that it installed." + // So let's help it a bit. + // +- if (!uli && exists (usr_loc_inc, true /* ignore_error */)) +- is.push_back (usr_loc_inc); + } + } + #endif diff --git a/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild b/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild new file mode 100644 index 0000000000000..df3cbb7b3e1ec --- /dev/null +++ b/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)" + +BUILD2_PN=build2-toolchain +BUILD2_PV="0.13.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} + !> \ + 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.chroot="${D}" \ + 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 +} diff --git a/dev-cpp/libodb/metadata.xml b/dev-cpp/libodb/metadata.xml new file mode 100644 index 0000000000000..31fe31dbd5b6a --- /dev/null +++ b/dev-cpp/libodb/metadata.xml @@ -0,0 +1,20 @@ + + + + + gienah@gentoo.org + Mark Wright + + + ODB is an open-source, cross-platform, and cross-database + object-relational mapping (ORM) system for C++. It allows you + to persist C++ objects to a relational database without having + to deal with tables, columns, or SQL and without manually + writing any mapping code. ODB supports MySQL, SQLite, + PostgreSQL, Oracle, and Microsoft SQL Server relational + databases as well as C++98/03 and C++11 language standards. It + also comes with optional profiles for Boost and Qt which allow + you to seamlessly use value types, containers, and smart + pointers from these libraries in your persistent C++ classes. + +