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 CCE64158088 for ; Wed, 20 Oct 2021 02:42:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B5F4E083D; Wed, 20 Oct 2021 02:42:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 00434E083D for ; Wed, 20 Oct 2021 02:42:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0D80F3438E3 for ; Wed, 20 Oct 2021 02:42:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A43B178 for ; Wed, 20 Oct 2021 02:42:35 +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: <1634696138.743dc8f916fcbd4bef81a6f933c61f5a77a6a1f9.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/z3/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/z3/z3-4.8.11b.ebuild X-VCS-Directories: sci-mathematics/z3/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 743dc8f916fcbd4bef81a6f933c61f5a77a6a1f9 X-VCS-Branch: master Date: Wed, 20 Oct 2021 02:42:35 +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: 9bdc6110-b0b1-49f7-a794-59cad3f61bb1 X-Archives-Hash: 6d7d9629faddd388b58cea90e453d597 commit: 743dc8f916fcbd4bef81a6f933c61f5a77a6a1f9 Author: Alexander Golubev gmail com> AuthorDate: Sun Jun 20 01:14:38 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Oct 20 02:15:38 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=743dc8f9 sci-mathematics/z3: fix build failure with USE="java" Closes:https://bugs.gentoo.org/673126 Signed-off-by: Alexander Golubev gmail.com> Closes: https://github.com/gentoo/gentoo/pull/21338 Signed-off-by: Sam James gentoo.org> sci-mathematics/z3/z3-4.8.11b.ebuild | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sci-mathematics/z3/z3-4.8.11b.ebuild b/sci-mathematics/z3/z3-4.8.11b.ebuild index d4386c546aa..aec3b57fd99 100644 --- a/sci-mathematics/z3/z3-4.8.11b.ebuild +++ b/sci-mathematics/z3/z3-4.8.11b.ebuild @@ -6,7 +6,7 @@ EAPI=7 CMAKE_ECLASS=cmake PYTHON_COMPAT=( python3_{8..10} ) -inherit cmake-multilib python-single-r1 toolchain-funcs +inherit cmake-multilib java-pkg-opt-2 python-single-r1 toolchain-funcs DESCRIPTION="An efficient theorem prover" HOMEPAGE="https://github.com/Z3Prover/z3/" @@ -28,6 +28,11 @@ BDEPEND=" CMAKE_BUILD_TYPE=RelWithDebInfo +src_prepare() { + cmake_src_prepare + java-pkg-opt-2_src_prepare +} + multilib_src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}" @@ -40,6 +45,8 @@ multilib_src_configure() { -DZ3_INCLUDE_GIT_HASH=OFF ) + multilib_is_native_abi && use java && mycmakeargs+=( -DJAVA_HOME="$(java-config -g JAVA_HOME )" ) + cmake_src_configure }