Add support for OpenJDK8 and Oracle-java
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
meta-oe/recipes-support/opencv/opencv_3.1.bb | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb
b/meta-oe/recipes-support/opencv/opencv_3.1.bb
index a5d681e79ca2..5cce2c9eaa16 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
@@ -58,11 +58,12 @@ PACKAGECONFIG[gphoto2] =
"-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2,"
PACKAGECONFIG[gstreamer] =
"-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0
gstreamer1.0-plugins-base,"
PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3,"
PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper,"
+PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include
-DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux
-DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include
-DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so
-DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native
fastjar-native openjdk-8-native,"
PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg,"
PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav,"
PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils,"
PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers,"
-PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include
-DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux
-DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include
-DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so
-DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native
oracle-jse-jdk oracle-jse-jdk-native,"
+PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include
-DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux
-DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include
-DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so
-DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native
oracle-jse-jdk oracle-jse-jdk-native,"
PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,"
PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON
-DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,,"
PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb,"
@@ -73,12 +74,14 @@ inherit distutils-base pkgconfig cmake
export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}"
export PYTHON="${STAGING_BINDIR_NATIVE}/python"
-export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java"
+export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java"
+export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native"
export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/"
TARGET_CC_ARCH += "-I${S}/include "
PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'oracle-java',
'${PN}-java-dbg ${PN}-java', '', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java-dbg ${PN}-java',
'', d)} \
${PN}-samples-dbg ${PN}-samples ${PN}-apps python-opencv"
python populate_packages_prepend () {
--
2.10.2
--
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
