commit:     743dc8f916fcbd4bef81a6f933c61f5a77a6a1f9
Author:     Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Sun Jun 20 01:14:38 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <fatzer2 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21338
Signed-off-by: Sam James <sam <AT> 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
 }
 

Reply via email to