diff options
| author | Tim Orling <ticotimo@gmail.com> | 2024-02-19 20:10:25 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2024-02-19 23:22:24 -0800 |
| commit | 1e1458f98eefd57cdf94877308aed6a68a8e7def (patch) | |
| tree | c62f2c9a5a57f74a15cf4c72d5d3e9fdd76daa82 /meta-oe/recipes-extended/upm/upm_git.bb | |
| parent | 94c20e1ef4d7bd1dde1003cde25b9adb1ccc8310 (diff) | |
| download | meta-openembedded-1e1458f98eefd57cdf94877308aed6a68a8e7def.tar.gz | |
meta-oe: drop ${PYTHON_PN}
python2 is long unsupported, so we no longer need this variable
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/upm/upm_git.bb')
| -rw-r--r-- | meta-oe/recipes-extended/upm/upm_git.bb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb index 8468ff775d..3aa766d0bd 100644 --- a/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-oe/recipes-extended/upm/upm_git.bb | |||
| @@ -42,21 +42,21 @@ BINDINGS:armv4 ??= "python" | |||
| 42 | BINDINGS:armv5 ??= "python" | 42 | BINDINGS:armv5 ??= "python" |
| 43 | 43 | ||
| 44 | PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \ | 44 | PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \ |
| 45 | ${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}" | 45 | ${@bb.utils.contains('PACKAGES', 'python3-${PN}', 'python', '', d)}" |
| 46 | 46 | ||
| 47 | PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}, -DBUILDSWIGPYTHON=OFF, swig-native ${PYTHON_PN}," | 47 | PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}, -DBUILDSWIGPYTHON=OFF, swig-native python3," |
| 48 | PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native," | 48 | PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native," |
| 49 | 49 | ||
| 50 | do_configure:prepend() { | 50 | do_configure:prepend() { |
| 51 | sed -i s:\"lib/${_packages_path}:\"${baselib}/${_packages_path}:g ${S}/cmake/modules/OpenCVDetectPython.cmake | 51 | sed -i s:\"lib/${_packages_path}:\"${baselib}/${_packages_path}:g ${S}/cmake/modules/OpenCVDetectPython.cmake |
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | FILES:${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}" | 54 | FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}" |
| 55 | RDEPENDS:${PYTHON_PN}-${PN} += "${PYTHON_PN}" | 55 | RDEPENDS:python3-${PN} += "python3" |
| 56 | 56 | ||
| 57 | FILES:node-${PN} = "${prefix}/lib/node_modules/" | 57 | FILES:node-${PN} = "${prefix}/lib/node_modules/" |
| 58 | RDEPENDS:node-${PN} += "nodejs" | 58 | RDEPENDS:node-${PN} += "nodejs" |
| 59 | 59 | ||
| 60 | ### Include desired language bindings ### | 60 | ### Include desired language bindings ### |
| 61 | PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}" | 61 | PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}" |
| 62 | PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', '${PYTHON_PN}-${PN}', '', d)}" | 62 | PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', 'python3-${PN}', '', d)}" |
