The --bindir (etc.) arguments can be absolute paths, so there's no need to work out the relative paths and we can instead pass them directly.
Also re-order the options to match the order in the Meson manual, for ease of checking that we pass all the paths that Meson uses. Notably, we don't set --licensedir, but we handle license manifests ourselves. Signed-off-by: Ross Burton <[email protected]> --- meta/classes-recipe/meson.bbclass | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/meta/classes-recipe/meson.bbclass b/meta/classes-recipe/meson.bbclass index 4cf5de6753e..0709a1313a4 100644 --- a/meta/classes-recipe/meson.bbclass +++ b/meta/classes-recipe/meson.bbclass @@ -25,24 +25,22 @@ MESON_TARGET ?= "" # Since 0.60.0 you can specify custom tags to install MESON_INSTALL_TAGS ?= "" -def noprefix(var, d): - return d.getVar(var).replace(d.getVar('prefix') + '/', '', 1) - MESON_BUILDTYPE ?= "${@oe.utils.vartrue('DEBUG_BUILD', 'debug', 'plain', d)}" MESON_BUILDTYPE[vardeps] += "DEBUG_BUILD" -MESONOPTS = " --prefix ${prefix} \ - --buildtype ${MESON_BUILDTYPE} \ - --bindir ${@noprefix('bindir', d)} \ - --sbindir ${@noprefix('sbindir', d)} \ - --datadir ${@noprefix('datadir', d)} \ - --libdir ${@noprefix('libdir', d)} \ - --libexecdir ${@noprefix('libexecdir', d)} \ - --includedir ${@noprefix('includedir', d)} \ - --mandir ${@noprefix('mandir', d)} \ - --infodir ${@noprefix('infodir', d)} \ - --sysconfdir ${sysconfdir} \ + +MESONOPTS = " --buildtype ${MESON_BUILDTYPE} \ + --prefix ${prefix} \ + --bindir ${bindir} \ + --datadir ${datadir} \ + --includedir ${includedir} \ + --infodir ${infodir} \ + --libdir ${libdir} \ + --libexecdir ${libexecdir} \ --localstatedir ${localstatedir} \ + --mandir ${mandir} \ + --sbindir ${sbindir} \ --sharedstatedir ${sharedstatedir} \ + --sysconfdir ${sysconfdir} \ --wrap-mode nodownload \ --native-file ${WORKDIR}/meson.native" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#227556): https://lists.openembedded.org/g/openembedded-core/message/227556 Mute This Topic: https://lists.openembedded.org/mt/116733175/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
