Date: Wed, 14 Apr 2021 16:43:58 GMT From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 067ec283a981 - 2021Q2 - graphics/opencv: Fix JAVA option and correct Apache Ant usage Message-ID: <202104141643.13EGhwJa012049@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by jkim: URL: https://cgit.FreeBSD.org/ports/commit/?id=067ec283a98153d2d3de02f9465faac38ac0c561 commit 067ec283a98153d2d3de02f9465faac38ac0c561 Author: Jung-uk Kim <jkim@FreeBSD.org> AuthorDate: 2021-04-14 16:13:30 +0000 Commit: Jung-uk Kim <jkim@FreeBSD.org> CommitDate: 2021-04-14 16:43:24 +0000 graphics/opencv: Fix JAVA option and correct Apache Ant usage JAVA option did not work because the actual build knob was wrong. Especially, on a system where devel/apache-ant was installed, ant and java binaries were automatically detected and enabled even if the JAVA option was disabled. While I am here, fix Apache Ant usage by setteing JAVACMD variable. Without it, it may pick up java binary from JRE via javavm(1) from java/javavmwrapper. If ant script is used with java from JRE, build fails because it cannot find jar. Approved by: tcberner (maintainer) (cherry picked from commit 71117cddc9fc29c1e83c14e94c4b04179c0158d3) --- graphics/opencv/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 2f421789f279..aa417c0fe142 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -72,8 +72,11 @@ OPTIONS_SUB= yes HARDENING_CMAKE_BOOL= ENABLE_BUILD_HARDENING HARDENING_DESC= Enable hardening of the resulting binaries -JAVA_CMAKE_BOOL= BUILD_openv_java +JAVA_CMAKE_BOOL= BUILD_JAVA JAVA_BUILD_DEPENDS= ant:devel/apache-ant +JAVA_MAKE_ENV= JAVACMD=${JAVA} +JAVA_USE= JAVA=yes +JAVA_VARS= JAVA_BUILD=yes PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104141643.13EGhwJa012049>