Move the installed site-packages directory to the correct
location.
Signed-off-by: Zoltán Böszörményi <[email protected]>
---
meta-oe/recipes-support/opencv/opencv_4.13.0.bb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_4.13.0.bb
b/meta-oe/recipes-support/opencv/opencv_4.13.0.bb
index 981b06e33b..206159876d 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.13.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.13.0.bb
@@ -117,7 +117,7 @@ PACKAGECONFIG[opencl] =
"-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtu
PACKAGECONFIG[openvino] =
"-DWITH_OPENVINO=ON,-DWITH_OPENVINO=OFF,openvino-inference-engine,openvino-inference-engine"
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[python3] =
"-DPYTHON3_INCLUDE_PATH=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}
-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/_core/include,,python3-numpy,"
+PACKAGECONFIG[python3] =
"-DPYTHON3_INCLUDE_PATH=${STAGING_INCDIR}/${PYTHON_DIR}
-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/_core/include,,python3-numpy,"
PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_BIN_EXAMPLES=ON
-DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,,"
PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb,"
PACKAGECONFIG[tests] = "-DBUILD_TESTS=ON
-DINSTALL_TESTS=ON,-DBUILD_TESTS=OFF,,"
@@ -224,6 +224,10 @@ do_install:append() {
# mesa-demos /usr/bin/shape file.
mv ${D}/${bindir}/shape ${D}/${bindir}/opencv_shape
fi
+
+ if [ ! -d ${D}${libdir}/${PYTHON_DIR} ]; then
+ mv ${D}${libdir}/python${PYTHON_BASEVERSION}
${D}${libdir}/${PYTHON_DIR}
+ fi
}
do_install:append:class-target() {
--
2.53.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#125622):
https://lists.openembedded.org/g/openembedded-devel/message/125622
Mute This Topic: https://lists.openembedded.org/mt/118499812/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
