diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-07-29 17:04:53 +0200 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-08-03 10:21:25 -0700 |
| commit | c61dc077bbd81260e4f167fa2251643ba0ba6974 (patch) | |
| tree | 66c3243f8f64ae60f66f70a16e8128c247254a65 /meta-oe/recipes-extended/upm | |
| parent | c5f7cfb8db54cfa4257797db5bd87828dea43296 (diff) | |
| download | meta-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.bb | 18 |
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 | ||
| 21 | SRC_URI_append_toolchain-clang_x86 = " file://0001-nmea_gps-Link-with-latomic.patch " | 21 | SRC_URI:append:toolchain-clang:x86 = " file://0001-nmea_gps-Link-with-latomic.patch " |
| 22 | 22 | ||
| 23 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
| 24 | 24 | ||
| @@ -30,15 +30,15 @@ inherit distutils3-base cmake pkgconfig | |||
| 30 | EXTRA_OECMAKE += "-UPYTHON_EXECUTABLE -DWERROR=off" | 30 | EXTRA_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). |
| 37 | BINDINGS ??= "python" | 37 | BINDINGS ??= "python" |
| 38 | 38 | ||
| 39 | # nodejs isn't available for armv4/armv5 architectures | 39 | # nodejs isn't available for armv4/armv5 architectures |
| 40 | BINDINGS_armv4 ??= "python" | 40 | BINDINGS:armv4 ??= "python" |
| 41 | BINDINGS_armv5 ??= "python" | 41 | BINDINGS:armv5 ??= "python" |
| 42 | 42 | ||
| 43 | PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \ | 43 | PACKAGECONFIG ??= "${@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', '', | |||
| 46 | 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}," | 46 | 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[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native," | 47 | PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native," |
| 48 | 48 | ||
| 49 | do_configure_prepend() { | 49 | do_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 | ||
| 53 | FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}" | 53 | FILES:${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}" |
| 54 | RDEPENDS_${PYTHON_PN}-${PN} += "${PYTHON_PN}" | 54 | RDEPENDS:${PYTHON_PN}-${PN} += "${PYTHON_PN}" |
| 55 | 55 | ||
| 56 | FILES_node-${PN} = "${prefix}/lib/node_modules/" | 56 | FILES:node-${PN} = "${prefix}/lib/node_modules/" |
| 57 | RDEPENDS_node-${PN} += "nodejs" | 57 | RDEPENDS:node-${PN} += "nodejs" |
| 58 | 58 | ||
| 59 | ### Include desired language bindings ### | 59 | ### Include desired language bindings ### |
| 60 | PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}" | 60 | PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}" |
