From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/topkg/
Date: Mon, 14 Jun 2021 18:41:04 +0000 (UTC) [thread overview]
Message-ID: <1623696055.c2c0cc0e8cfc9c592252a0c6d5e5ff23a6215c4e.sam@gentoo> (raw)
commit: c2c0cc0e8cfc9c592252a0c6d5e5ff23a6215c4e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 14 18:40:37 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 14 18:40:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2c0cc0e
dev-ml/topkg: fix build without ocamlopt
Closes: https://bugs.gentoo.org/795987
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-ml/topkg/topkg-1.0.3.ebuild | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/dev-ml/topkg/topkg-1.0.3.ebuild b/dev-ml/topkg/topkg-1.0.3.ebuild
index 15977974d68..6afcb25f56b 100644
--- a/dev-ml/topkg/topkg-1.0.3.ebuild
+++ b/dev-ml/topkg/topkg-1.0.3.ebuild
@@ -12,12 +12,12 @@ SRC_URI="https://github.com/dbuenzli/topkg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="ISC"
SLOT="0/${PV}"
KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE=""
+IUSE="+ocamlopt"
RDEPEND="dev-ml/result:=
dev-ml/ocamlbuild:=
dev-ml/findlib:=
- dev-lang/ocaml:="
+ dev-lang/ocaml:=[ocamlopt?]"
DEPEND="${RDEPEND}"
src_compile() {
@@ -27,7 +27,12 @@ src_compile() {
src_install() {
# Can't use opam-installer here as it is an opam dep...
findlib_src_preinst
- local nativelibs="$(echo _build/src/${PN}*.cm{x,xa,xs,ti} _build/src/${PN}.a)"
+
+ local nativelibs
+ if use ocamlopt; then
+ nativelibs=$(echo _build/src/${PN}*.cm{x,xa,xs,ti} _build/src/${PN}.a)
+ fi
+
ocamlfind install ${PN} _build/pkg/META _build/src/${PN}.mli _build/src/${PN}.cm{a,i} ${nativelibs} || die
dodoc CHANGES.md DEVEL.md README.md
}
next reply other threads:[~2021-06-14 18:41 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-14 18:41 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-03-17 11:27 [gentoo-commits] repo/gentoo:master commit in: dev-ml/topkg/ Arthur Zamarin
2023-03-17 6:48 Arthur Zamarin
2023-03-16 23:16 Sam James
2023-01-23 7:57 Maciej Barć
2022-12-16 11:06 Maciej Barć
2022-02-02 7:23 Alfredo Tupone
2021-02-11 6:31 Sam James
2021-02-11 6:26 Sam James
2021-02-10 18:53 Sam James
2021-02-10 16:33 Sam James
2020-10-28 3:36 Sam James
2020-10-13 12:54 Mark Wright
2017-10-17 6:04 Alexis Ballier
2017-07-15 10:43 Alexis Ballier
2017-06-29 20:28 Alexis Ballier
2017-04-05 9:51 Michael Weber
2017-03-17 9:47 Alexis Ballier
2017-03-17 9:47 Alexis Ballier
2017-03-15 14:26 Alexis Ballier
2017-01-09 11:08 Alexis Ballier
2016-11-28 20:27 Alexis Ballier
2016-11-28 20:27 Alexis Ballier
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=1623696055.c2c0cc0e8cfc9c592252a0c6d5e5ff23a6215c4e.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