* [gentoo-commits] repo/gentoo:master commit in: dev-util/build2/
@ 2020-07-21 3:08 Mark Wright
0 siblings, 0 replies; 5+ messages in thread
From: Mark Wright @ 2020-07-21 3:08 UTC (permalink / raw
To: gentoo-commits
commit: cce662903d44519fd37ad43e7fc51e9dcb46780f
Author: Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 21 03:08:30 2020 +0000
Commit: Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 03:08:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cce66290
dev-util/build2: Use || die, formatting
Correct the build2/build2/buildfile build2/libbuild2/buildfile paths.
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Mark Wright <gienah <AT> gentoo.org>
.../build2-0.13.0_alpha0_pre20200718101251.ebuild | 28 +++++++++++++---------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/dev-util/build2/build2-0.13.0_alpha0_pre20200718101251.ebuild b/dev-util/build2/build2-0.13.0_alpha0_pre20200718101251.ebuild
index 20a81aeca39..72226d3f5bc 100644
--- a/dev-util/build2/build2-0.13.0_alpha0_pre20200718101251.ebuild
+++ b/dev-util/build2/build2-0.13.0_alpha0_pre20200718101251.ebuild
@@ -43,21 +43,27 @@ b() {
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
+ "-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
+ -i buildfile build/bootstrap.build \
+ || die
if has_version dev-util/pkgconf; then
- for i in build2/buildfile libbuild2/buildfile; do
+ 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}"
+ "$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
+ "$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
+ "${i}" \
+ || die
done
sed \
-e 's:libpkgconf[/]\?::' \
- -i buildfile build/bootstrap.build
+ -i buildfile build/bootstrap.build \
+ || die
fi
default
@@ -65,9 +71,9 @@ src_prepare() {
src_configure() {
emake -C build2 -f bootstrap.gmake \
- CXX=$(tc-getCXX) \
- CXXFLAGS="${CXXFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+ CXX=$(tc-getCXX) \
+ CXXFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
b configure \
config.cxx="$(tc-getCXX)" \
@@ -96,6 +102,6 @@ src_test() {
src_install() {
b install
- mkdir -p "${ED}"/usr/share/doc/${PF}/html
+ mkdir -p "${ED}"/usr/share/doc/${PF}/html || die
mv -f "${ED}"/usr/share/doc/${PF}/*.xhtml "${ED}"/usr/share/doc/${PF}/html
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/build2/
@ 2020-07-21 10:56 Mark Wright
0 siblings, 0 replies; 5+ messages in thread
From: Mark Wright @ 2020-07-21 10:56 UTC (permalink / raw
To: gentoo-commits
commit: 0d0933154866e861d68d41c5ab64cc65f4ea6df9
Author: Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 21 10:43:48 2020 +0000
Commit: Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 10:56:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d093315
dev-util/build2: Add || die on mv xhtml files
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Mark Wright <gienah <AT> gentoo.org>
dev-util/build2/build2-0.13.0_alpha0_pre20200718101251.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/build2/build2-0.13.0_alpha0_pre20200718101251.ebuild b/dev-util/build2/build2-0.13.0_alpha0_pre20200718101251.ebuild
index 72226d3f5bc..b6634c8ef4d 100644
--- a/dev-util/build2/build2-0.13.0_alpha0_pre20200718101251.ebuild
+++ b/dev-util/build2/build2-0.13.0_alpha0_pre20200718101251.ebuild
@@ -103,5 +103,5 @@ src_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
+ mv -f "${ED}"/usr/share/doc/${PF}/*.xhtml "${ED}"/usr/share/doc/${PF}/html || die
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/build2/
@ 2020-07-21 10:56 Mark Wright
0 siblings, 0 replies; 5+ messages in thread
From: Mark Wright @ 2020-07-21 10:56 UTC (permalink / raw
To: gentoo-commits
commit: d717d5855f276e71c0089cdd2416405e772de9ea
Author: Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 21 10:46:17 2020 +0000
Commit: Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 10:56:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d717d585
dev-util/build2: Bump to 0.13.0
Unbundle the libodb and libodb-sqlite ODB runtime libs.
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Mark Wright <gienah <AT> gentoo.org>
dev-util/build2/Manifest | 1 +
dev-util/build2/build2-0.13.0.ebuild | 126 +++++++++++++++++++++++++++++++++++
2 files changed, 127 insertions(+)
diff --git a/dev-util/build2/Manifest b/dev-util/build2/Manifest
index a30c3d8a0c9..24820413b2b 100644
--- a/dev-util/build2/Manifest
+++ b/dev-util/build2/Manifest
@@ -1 +1,2 @@
DIST build2-toolchain-0.13.0-a.0.20200718101251.64a2db402f5e.tar.xz 4156700 BLAKE2B c05e1beaf482c32889496763f84382e0ee2585b6961fabc494b34dec940378e4450d07e2b704317419d19695d6372575fb8a3915fa85b2ce3818a9e60940375f SHA512 6ea69f84904f4ba7711fc6ec49f631eded65e7e36ab41b4264b96badf347b628b04e28873490886c7dd77f542fd6e8ecac71ab381c537cf05b269e5cc255188a
+DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33 SHA512 0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
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 00000000000..e5b6999ee80
--- /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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/build2/
@ 2020-07-27 6:26 Mark Wright
0 siblings, 0 replies; 5+ messages in thread
From: Mark Wright @ 2020-07-27 6:26 UTC (permalink / raw
To: gentoo-commits
commit: 87c05928292a45e3eac19f776ce7e18ed93485cc
Author: Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 27 06:26:08 2020 +0000
Commit: Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 06:26:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87c05928
dev-util/build2: Drop old release candidate
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Mark Wright <gienah <AT> gentoo.org>
dev-util/build2/Manifest | 1 -
.../build2-0.13.0_alpha0_pre20200718101251.ebuild | 107 ---------------------
2 files changed, 108 deletions(-)
diff --git a/dev-util/build2/Manifest b/dev-util/build2/Manifest
index 24820413b2b..b147c4c3370 100644
--- a/dev-util/build2/Manifest
+++ b/dev-util/build2/Manifest
@@ -1,2 +1 @@
-DIST build2-toolchain-0.13.0-a.0.20200718101251.64a2db402f5e.tar.xz 4156700 BLAKE2B c05e1beaf482c32889496763f84382e0ee2585b6961fabc494b34dec940378e4450d07e2b704317419d19695d6372575fb8a3915fa85b2ce3818a9e60940375f SHA512 6ea69f84904f4ba7711fc6ec49f631eded65e7e36ab41b4264b96badf347b628b04e28873490886c7dd77f542fd6e8ecac71ab381c537cf05b269e5cc255188a
DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33 SHA512 0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
diff --git a/dev-util/build2/build2-0.13.0_alpha0_pre20200718101251.ebuild b/dev-util/build2/build2-0.13.0_alpha0_pre20200718101251.ebuild
deleted file mode 100644
index b6634c8ef4d..00000000000
--- a/dev-util/build2/build2-0.13.0_alpha0_pre20200718101251.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT="64a2db402f5e"
-MY_PN=build2-toolchain
-MY_P="${MY_PN}-$(ver_cut 1-3)-a.$(ver_cut 5).$(ver_cut 7).${COMMIT}"
-
-inherit toolchain-funcs multiprocessing
-SRC_URI="https://stage.build2.org/0/$(ver_cut 1-3)-a.$(ver_cut 5)/${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-db/sqlite:3
-"
-DEPEND="virtual/pkgconfig
- ${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
-
- 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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/build2/
@ 2023-12-20 3:44 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-12-20 3:44 UTC (permalink / raw
To: gentoo-commits
commit: be3984ef50b0c59df17d6202f6bd20334f963735
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 03:21:35 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 03:44:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be3984ef
dev-util/build2: add 0.16.0
Closes: https://bugs.gentoo.org/916146
Closes: https://bugs.gentoo.org/914425
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/build2/Manifest | 1 +
dev-util/build2/build2-0.16.0.ebuild | 143 +++++++++++++++++++++++++++++++++++
2 files changed, 144 insertions(+)
diff --git a/dev-util/build2/Manifest b/dev-util/build2/Manifest
index 6b2a52834c2d..025ba8f3b810 100644
--- a/dev-util/build2/Manifest
+++ b/dev-util/build2/Manifest
@@ -1,2 +1,3 @@
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 build2-toolchain-0.16.0.tar.xz 5545392 BLAKE2B daefa8745cd342b0de7d74c3b66e3811b95fec9b8c14b29b1fd030d796a31586e0ef401b296cdae5a2d27cf9c337092b707e5fb0673356edff35800bb4be5004 SHA512 f926f3be07287ae8d0ff44e04fdee8c80982db2fa9e33012afb3fe21ee6973d771a3df33a7b976cc714c905d443020501dc96ea3546c76600760c3574e6ae625
diff --git a/dev-util/build2/build2-0.16.0.ebuild b/dev-util/build2/build2-0.16.0.ebuild
new file mode 100644
index 000000000000..e823b9f35655
--- /dev/null
+++ b/dev-util/build2/build2-0.16.0.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=build2-toolchain
+MY_P="${MY_PN}-${PV}"
+
+inherit toolchain-funcs multiprocessing
+
+DESCRIPTION="Cross-platform toolchain for building and packaging C++ code"
+HOMEPAGE="https://build2.org"
+SRC_URI="https://download.build2.org/${PV}/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ ~dev-cpp/libodb-2.5.0_beta25
+ ~dev-cpp/libodb-sqlite-2.5.0_beta25
+ dev-db/sqlite:3
+"
+BDEPEND="virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.14.0-update-for-install.patch
+)
+
+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() {
+ # Unbundle dev-cpp/libodb and dev-cpp/libodb-sqlite
+ 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 -i \
+ -e 's:libsqlite3[/]\?::' \
+ 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 -i \
+ -e 's:libodb-sqlite[/]\?::' \
+ -e 's:libodb[/]\?::' \
+ 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.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: build2/ bpkg/ bdep/ libbuild2-kconfig/ \
+ config.install.chroot="${D}"
+ rm -rf "${ED}"/usr/include/odb \
+ "${ED}"/usr/include/pkgconf/libpkgconf \
+ || die
+ rm -f "${ED}"/usr/include/sqlite3.h \
+ "${ED}"/usr/include/sqlite3ext.h \
+ "${ED}"/usr/$(get_libdir)/libodb.so \
+ "${ED}"/usr/$(get_libdir)/libodb-*.so \
+ "${ED}"/usr/$(get_libdir)/libodb-sqlite.so \
+ "${ED}"/usr/$(get_libdir)/libodb-sqlite-*.so \
+ "${ED}"/usr/$(get_libdir)/libpkgconf.so \
+ "${ED}"/usr/$(get_libdir)/libsqlite3.so \
+ "${ED}"/usr/$(get_libdir)/pkgconfig/libodb-sqlite.pc \
+ "${ED}"/usr/$(get_libdir)/pkgconfig/libodb.shared.pc \
+ "${ED}"/usr/$(get_libdir)/pkgconfig/libodb-sqlite.shared.pc \
+ "${ED}"/usr/$(get_libdir)/pkgconfig/libpkgconf.pc \
+ "${ED}"/usr/$(get_libdir)/pkgconfig/libodb.pc \
+ || die
+ mkdir -p "${ED}"/usr/share/doc/${PF}/html || die
+ mv -f "${ED}"/usr/share/doc/${PF}/*.xhtml "${ED}"/usr/share/doc/${PF}/html || die
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-12-20 3:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-27 6:26 [gentoo-commits] repo/gentoo:master commit in: dev-util/build2/ Mark Wright
-- strict thread matches above, loose matches on Subject: below --
2023-12-20 3:44 Sam James
2020-07-21 10:56 Mark Wright
2020-07-21 10:56 Mark Wright
2020-07-21 3:08 Mark Wright
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox