diff options
| author |   Mark Wright <gienah@gentoo.org> | 2020-07-21 13:08:30 +1000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2020-07-21 13:08:30 +1000 |
| commit | cce662903d44519fd37ad43e7fc51e9dcb46780f (patch) | |
| tree | a654bb56edffbf4b880a7a950ecdcc9a24bb3ef7 /dev-util/build2 | |
| parent | net-misc/{gns3-gui,gns3-server}: drop to m-n (diff) | |
| download | gentoo-cce662903d44519fd37ad43e7fc51e9dcb46780f.tar.gz gentoo-cce662903d44519fd37ad43e7fc51e9dcb46780f.tar.bz2 gentoo-cce662903d44519fd37ad43e7fc51e9dcb46780f.zip | |
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@gentoo.org>
Diffstat (limited to 'dev-util/build2')
| -rw-r--r-- | dev-util/build2/build2-0.13.0_alpha0_pre20200718101251.ebuild | 28 |
1 files 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 20a81aeca39e..72226d3f5bc6 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 } |