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 A0AA21382C5 for ; Thu, 4 Feb 2021 12:45:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84A71E0827; Thu, 4 Feb 2021 12:45:31 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 6D03DE0827 for ; Thu, 4 Feb 2021 12:45:31 +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 7EA51342419 for ; Thu, 4 Feb 2021 12:45:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34E60476 for ; Thu, 4 Feb 2021 12:45:29 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1612442707.83669d5aa1b936147a19b7340b49492cff698c0b.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlbuild/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild X-VCS-Directories: dev-ml/ocamlbuild/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 83669d5aa1b936147a19b7340b49492cff698c0b X-VCS-Branch: master Date: Thu, 4 Feb 2021 12:45:29 +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: 5b2fe9f1-7423-4e4f-8813-69b2783705b0 X-Archives-Hash: 8db841d6c749cdbaec97b5def4cbd122 commit: 83669d5aa1b936147a19b7340b49492cff698c0b Author: Alfredo Tupone gentoo org> AuthorDate: Thu Feb 4 12:45:07 2021 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Thu Feb 4 12:45:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83669d5a dev-ml/ocamlbuild: fix test Closes: https://bugs.gentoo.org/625106 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Alfredo Tupone gentoo.org> dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild index 524c937beda..dfaf2d16bd3 100644 --- a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild +++ b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild @@ -21,6 +21,14 @@ RDEPEND="${DEPEND} DEPEND="${DEPEND} test? ( dev-ml/findlib )" +src_prepare() { + sed -i \ + -e "/package_exists/s:camlp4.macro:xxxxxx:" \ + -e "/package_exists/s:menhirLib.macro:xxxxxx:" \ + testsuite/external.ml || die + default +} + src_configure() { emake -f configure.make Makefile.config \ PREFIX="${EPREFIX}/usr" \ @@ -31,6 +39,11 @@ src_configure() { NATDYNLINK=$(usex ocamlopt true false) } +src_compile() { + emake src/ocamlbuild_config.cmo + default +} + src_install() { emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install dodoc Changes