From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-util/build2/Manifest | 4 + dev-util/build2/build2-0.13.0.ebuild | 126 +++++++++++++++++++++ ...ild2-0.13.0_alpha0_pre20200710-nousrlocal.patch | 52 +++++++++ dev-util/build2/metadata.xml | 34 ++++++ 4 files changed, 216 insertions(+) create mode 100644 dev-util/build2/Manifest create mode 100644 dev-util/build2/build2-0.13.0.ebuild create mode 100644 dev-util/build2/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch create mode 100644 dev-util/build2/metadata.xml (limited to 'dev-util/build2') diff --git a/dev-util/build2/Manifest b/dev-util/build2/Manifest new file mode 100644 index 000000000000..707eb6113bfd --- /dev/null +++ b/dev-util/build2/Manifest @@ -0,0 +1,4 @@ +AUX build2-0.13.0_alpha0_pre20200710-nousrlocal.patch 1931 BLAKE2B 5faca35d7501cd0348910719286bcab2736cd94166db626bd77a62b90512ed6d99fbc2548a6ff30b0f5badecdcaa67a462a6ff11f51af8f9b9faba24fd8edefd SHA512 f57de10af06aa138a7c153e56d35b173a4804324557611baabb38ac00cfde0c8db2b59b57d5ad23a3f76877168745f1d40be1b7527241b47a163df4cc5879967 +DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33 SHA512 0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4 +EBUILD build2-0.13.0.ebuild 3301 BLAKE2B 62ee4afadbdc4f38fdbe54281c6c12e53dc3b2c3de9ac32300568215d885d71ef2b38cb0704299974936290838db40ac0cf3a48fa4fd2e9af0f75913b1915dec SHA512 7a0da7306be500b845b6c44c0828cb4c7eef6d51f76eb04dfe7ee630f4f41f48d46f892a9ea15283b5694aeed9dee822e2aaf6e9823de4d1a38776f1f50f1d92 +MISC metadata.xml 1093 BLAKE2B 8f05f9a182a871b5be366d822fada23d1e7c6c04963b3344eba875923174d3dbc5a19e1cfae89fd46bf084beeb4456f42a9a149a70ba35e9b2adeb83a61af927 SHA512 72169c877b0e20ebfcb2ef5ae5635977103d6d69849818d9f2a7a478f84f348375383ad512ea98a24a1d16abc83a970663f5bf987f8dfc00c1af1286725bec9a diff --git a/dev-util/build2/build2-0.13.0.ebuild b/dev-util/build2/build2-0.13.0.ebuild new file mode 100644 index 000000000000..e5b6999ee800 --- /dev/null +++ b/dev-util/build2/build2-0.13.0.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN=build2-toolchain +MY_P="${MY_PN}-${PV}" + +inherit toolchain-funcs multiprocessing +SRC_URI="https://download.build2.org/${PV}/${MY_P}.tar.xz" +KEYWORDS="~amd64 ~x86" +DESCRIPTION="cross-platform toolchain for building and packaging C++ code" +HOMEPAGE="https://build2.org" + +LICENSE="MIT" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + ~dev-cpp/libodb-2.5.0_beta19 + ~dev-cpp/libodb-sqlite-2.5.0_beta19 + dev-db/sqlite:3 +" +BDEPEND="virtual/pkgconfig" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-0.13.0_alpha0_pre20200710-nousrlocal.patch +) + +S="${WORKDIR}/${MY_P}" + +b() { + local myargs=( + --jobs $(makeopts_jobs) + --verbose 3 + ) + export LD_LIBRARY_PATH="${S}/libbutl/libbutl:${S}/build2/libbuild2:${S}/build2/libbuild2/bash:${S}/build2/libbuild2/in:${S}/build2/libbuild2/bin:${S}/build2/libbuild2/c:${S}/build2/libbuild2/cc:${S}/build2/libbuild2/cxx:${S}/build2/libbuild2/version:${S}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}" + set -- "${S}"/build2/build2/b-boot "${@}" "${myargs[@]}" + echo "${@}" + "${@}" || die "${@} failed" +} + +src_prepare() { + 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 + + for i in build2/build2/buildfile build2/libbuild2/buildfile; do + printf 'cxx.libs += %s\ncxx.poptions += %s\n' \ + "$($(tc-getPKG_CONFIG) libodb --libs)" \ + "$($(tc-getPKG_CONFIG) libodb --cflags)" >> \ + "${i}" \ + || die + printf 'cxx.libs += %s\ncxx.poptions += %s\n' \ + "$($(tc-getPKG_CONFIG) libodb-sqlite --libs)" \ + "$($(tc-getPKG_CONFIG) libodb-sqlite --cflags)" >> \ + "${i}" \ + || die + done + sed \ + -e 's:libodb[/]\?::' \ + -e 's:libodb-sqlite[/]\?::' \ + -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 + + default +} + +src_configure() { + emake -C build2 -f bootstrap.gmake \ + CXX=$(tc-getCXX) \ + CXXFLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS}" + + 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 + mkdir -p "${ED}"/usr/share/doc/${PF}/html || die + mv -f "${ED}"/usr/share/doc/${PF}/*.xhtml "${ED}"/usr/share/doc/${PF}/html || die +} diff --git a/dev-util/build2/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch b/dev-util/build2/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch new file mode 100644 index 000000000000..c3717856b6b7 --- /dev/null +++ b/dev-util/build2/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-util/build2/metadata.xml b/dev-util/build2/metadata.xml new file mode 100644 index 000000000000..4380b642027e --- /dev/null +++ b/dev-util/build2/metadata.xml @@ -0,0 +1,34 @@ + + + + + gienah@gentoo.org + Mark Wright + + + build2 is an open source (MIT), cross-platform build toolchain + for developing and packaging C and C++ code. It is a hierarchy + of tools that includes the build system, package dependency + manager (for package consumption), and project dependency + manager (for project development). Key features: + + Next-generation, Cargo-like integrated build toolchain for C + and C++. + + Covers entire project lifecycle: creation, development, + testing, and delivery. + + Uniform and consistent interface across all platforms and + compilers. + + Fast, multi-threaded build system with parallel building and + testing. + + Archive and version control-based package repositories. + + Dependency-free, all you need is a C++ compiler. + + + build2/build2 + + -- cgit v1.2.3