public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/luakit/
Date: Sun, 29 Nov 2020 17:09:04 +0000 (UTC)	[thread overview]
Message-ID: <1606669733.3821a11452bc185586530f578f68fa2f6e5d1039.marecki@gentoo> (raw)

commit:     3821a11452bc185586530f578f68fa2f6e5d1039
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 29 16:45:22 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Nov 29 17:08:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3821a114

www-client/luakit: fix USE=-luajit logic

This was not complete before because in the event of dev-lang/luajit
having been present, it would result in the luakit executable being
built against PUC Lua but luakit.so and the test suite against LuaJIT.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 www-client/luakit/luakit-2.2.1.ebuild | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/www-client/luakit/luakit-2.2.1.ebuild b/www-client/luakit/luakit-2.2.1.ebuild
index efeb361d7b9..6821a2d84cd 100644
--- a/www-client/luakit/luakit-2.2.1.ebuild
+++ b/www-client/luakit/luakit-2.2.1.ebuild
@@ -55,7 +55,8 @@ src_configure() {
 src_compile() {
 	emake \
 		PREFIX="${EPREFIX}/usr" \
-		${PN}
+		USE_LUAJIT=$(usex luajit 1 0) \
+		${PN} ${PN}.so
 
 	use doc && emake doc
 }
@@ -66,7 +67,9 @@ src_test() {
 		mv tests/async/${failing_test}.lua{,.disabled} || die
 	done
 
-	emake run-tests
+	emake \
+		USE_LUAJIT=$(usex luajit 1 0) \
+		run-tests
 }
 
 src_install() {


             reply	other threads:[~2020-11-29 17:09 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-29 17:09 Marek Szuba [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-03-22  3:12 [gentoo-commits] repo/gentoo:master commit in: www-client/luakit/ Sam James
2023-03-17  0:07 Sam James
2023-03-16 23:51 Sam James
2023-03-16 23:51 Sam James
2021-12-27 17:37 Arthur Zamarin
2021-06-08 13:24 Joonas Niilola
2021-06-08 13:24 Joonas Niilola
2021-06-08 13:24 Joonas Niilola
2021-01-25 17:38 Marek Szuba
2021-01-17 21:25 Marek Szuba
2020-09-24 13:49 Jeroen Roovers
2020-09-24  9:46 Jeroen Roovers
2020-04-01 14:38 Joonas Niilola
2019-05-23 18:30 Ben Kohler
2019-05-23 18:14 Ben Kohler
2018-07-07 12:15 Jonas Stein

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=1606669733.3821a11452bc185586530f578f68fa2f6e5d1039.marecki@gentoo \
    --to=marecki@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