From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: net-libs/accounts-qml/
Date: Sun, 17 Dec 2023 12:04:36 +0000 (UTC) [thread overview]
Message-ID: <1702814671.ae150890176998951cac4dc6107a7566c1f83c89.sam@gentoo> (raw)
commit: ae150890176998951cac4dc6107a7566c1f83c89
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 05:54:15 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 12:04:31 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae150890
net-libs/accounts-qml: fix multibuild
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/accounts-qml/accounts-qml-9999.ebuild | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/net-libs/accounts-qml/accounts-qml-9999.ebuild b/net-libs/accounts-qml/accounts-qml-9999.ebuild
index 5f43ea702f..f04e0f0b77 100644
--- a/net-libs/accounts-qml/accounts-qml-9999.ebuild
+++ b/net-libs/accounts-qml/accounts-qml-9999.ebuild
@@ -67,11 +67,14 @@ pkg_setup() {
src_prepare() {
default
- rm -v .gitignore doc/html/.gitignore || die
+ rm -v doc/html/.gitignore || die
+ multibuild_copy_sources
}
src_configure() {
my_src_configure() {
+ cd "${BUILD_DIR}" || die
+
local myqmakeargs=(
CONFIG+=no_docs \
PREFIX="${EPREFIX}"/usr
@@ -88,7 +91,12 @@ src_configure() {
}
src_compile() {
- multibuild_foreach_variant default
+ my_src_compile() {
+ emake -C "${BUILD_DIR}"
+ }
+
+ multibuild_foreach_variant my_src_compile
+
if use doc; then
local qtanybindir
if has_version "dev-qt/qttools:6[qdoc]"; then
@@ -103,7 +111,11 @@ src_compile() {
}
src_install() {
- multibuild_foreach_variant emake INSTALL_ROOT="${D}" install_subtargets
+ my_src_install() {
+ emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install_subtargets
+ }
+
+ multibuild_foreach_variant my_src_install
use doc && local HTML_DOCS=( doc/html )
einstalldocs
}
next reply other threads:[~2023-12-17 12:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-17 12:04 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-21 16:16 [gentoo-commits] proj/kde:master commit in: net-libs/accounts-qml/ Sam James
2024-01-03 18:29 Andreas Sturmlechner
2024-01-12 14:27 Sam James
2024-01-13 16:39 Sam James
2024-06-19 15:19 Andreas Sturmlechner
2024-08-09 19:36 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1702814671.ae150890176998951cac4dc6107a7566c1f83c89.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox