summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/upm
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-07-29 17:04:53 +0200
committerKhem Raj <raj.khem@gmail.com>2021-08-03 10:21:25 -0700
commitc61dc077bbd81260e4f167fa2251643ba0ba6974 (patch)
tree66c3243f8f64ae60f66f70a16e8128c247254a65 /meta-oe/recipes-extended/upm
parentc5f7cfb8db54cfa4257797db5bd87828dea43296 (diff)
downloadmeta-openembedded-c61dc077bbd81260e4f167fa2251643ba0ba6974.tar.gz
Convert to new override syntax
This is the result of automated script (0.9.1) conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/upm')
-rw-r--r--meta-oe/recipes-extended/upm/upm_git.bb18
1 files changed, 9 insertions, 9 deletions
diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb
index 6a7611f382..cd7dd9ae0f 100644
--- a/meta-oe/recipes-extended/upm/upm_git.bb
+++ b/meta-oe/recipes-extended/upm/upm_git.bb
@@ -18,7 +18,7 @@ SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http \
18 file://0001-cmake-Disable-using-Wno-maybe-uninitialized.patch \ 18 file://0001-cmake-Disable-using-Wno-maybe-uninitialized.patch \
19 " 19 "
20 20
21SRC_URI_append_toolchain-clang_x86 = " file://0001-nmea_gps-Link-with-latomic.patch " 21SRC_URI:append:toolchain-clang:x86 = " file://0001-nmea_gps-Link-with-latomic.patch "
22 22
23S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"
24 24
@@ -30,15 +30,15 @@ inherit distutils3-base cmake pkgconfig
30EXTRA_OECMAKE += "-UPYTHON_EXECUTABLE -DWERROR=off" 30EXTRA_OECMAKE += "-UPYTHON_EXECUTABLE -DWERROR=off"
31 31
32# override this in local.conf to get needed bindings. 32# override this in local.conf to get needed bindings.
33# BINDINGS_pn-upm="python" 33# BINDINGS:pn-upm="python"
34# will result in only the python bindings being built/packaged. 34# will result in only the python bindings being built/packaged.
35# Note: 'nodejs' is disabled by default because the bindings 35# Note: 'nodejs' is disabled by default because the bindings
36# generation currently fails with nodejs (>v7.x). 36# generation currently fails with nodejs (>v7.x).
37BINDINGS ??= "python" 37BINDINGS ??= "python"
38 38
39# nodejs isn't available for armv4/armv5 architectures 39# nodejs isn't available for armv4/armv5 architectures
40BINDINGS_armv4 ??= "python" 40BINDINGS:armv4 ??= "python"
41BINDINGS_armv5 ??= "python" 41BINDINGS:armv5 ??= "python"
42 42
43PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \ 43PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \
44 ${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}" 44 ${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}"
@@ -46,15 +46,15 @@ PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '',
46PACKAGECONFIG[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}," 46PACKAGECONFIG[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},"
47PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native," 47PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native,"
48 48
49do_configure_prepend() { 49do_configure:prepend() {
50 sed -i s:\"lib/${_packages_path}:\"${baselib}/${_packages_path}:g ${S}/cmake/modules/OpenCVDetectPython.cmake 50 sed -i s:\"lib/${_packages_path}:\"${baselib}/${_packages_path}:g ${S}/cmake/modules/OpenCVDetectPython.cmake
51} 51}
52 52
53FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}" 53FILES:${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}"
54RDEPENDS_${PYTHON_PN}-${PN} += "${PYTHON_PN}" 54RDEPENDS:${PYTHON_PN}-${PN} += "${PYTHON_PN}"
55 55
56FILES_node-${PN} = "${prefix}/lib/node_modules/" 56FILES:node-${PN} = "${prefix}/lib/node_modules/"
57RDEPENDS_node-${PN} += "nodejs" 57RDEPENDS:node-${PN} += "nodejs"
58 58
59### Include desired language bindings ### 59### Include desired language bindings ###
60PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}" 60PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}"