From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3FF5F1382C5 for ; Mon, 14 Jun 2021 18:41:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A6FCE0BE4; Mon, 14 Jun 2021 18:41:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 82FF7E0BE4 for ; Mon, 14 Jun 2021 18:41:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2F475340D65 for ; Mon, 14 Jun 2021 18:41:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9F39C794 for ; Mon, 14 Jun 2021 18:41:04 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1623696055.c2c0cc0e8cfc9c592252a0c6d5e5ff23a6215c4e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/topkg/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/topkg/topkg-1.0.3.ebuild X-VCS-Directories: dev-ml/topkg/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c2c0cc0e8cfc9c592252a0c6d5e5ff23a6215c4e X-VCS-Branch: master Date: Mon, 14 Jun 2021 18:41:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a97399fa-9971-48cd-8b6c-3643498cbf69 X-Archives-Hash: 4bf76b0b48f310d01edcc172614ddf2e commit: c2c0cc0e8cfc9c592252a0c6d5e5ff23a6215c4e Author: Sam James gentoo org> AuthorDate: Mon Jun 14 18:40:37 2021 +0000 Commit: Sam James gentoo 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 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 }