No change to the arguments being passed, but makes the recipe easier to read. GI_DATA_ENABLED is disabled in native builds so there is no need for the override.
Remove the assignment of VAPIGEN, cmake finds the binary on its own. Signed-off-by: Ross Burton <[email protected]> --- meta/recipes-support/libical/libical_4.0.5.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/libical/libical_4.0.5.bb b/meta/recipes-support/libical/libical_4.0.5.bb index 952e2c60540..edff836dcc4 100644 --- a/meta/recipes-support/libical/libical_4.0.5.bb +++ b/meta/recipes-support/libical/libical_4.0.5.bb @@ -19,11 +19,14 @@ inherit cmake pkgconfig gobject-introspection vala github-releases DEPENDS += "libical-native" -PACKAGECONFIG ??= "icu glib" +PACKAGECONFIG ??= "icu glib \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'introspection vala', '', d)}" PACKAGECONFIG[bdb] = ",-DCMAKE_DISABLE_FIND_PACKAGE_BDB=True,db" PACKAGECONFIG[glib] = "-DLIBICAL_GLIB=True,-DLIBICAL_GLIB=False,glib-2.0-native libxml2-native glib-2.0 libxml2" # ICU is used for RSCALE (RFC7529) support PACKAGECONFIG[icu] = ",-DCMAKE_DISABLE_FIND_PACKAGE_ICU=True,icu" +PACKAGECONFIG[introspection] = "-DLIBICAL_GOBJECT_INTROSPECTION=ON,-DLIBICAL_GOBJECT_INTROSPECTION=OFF" +PACKAGECONFIG[vala] = "-DLIBICAL_GLIB_VAPI=ON,-DLIBICAL_GLIB_VAPI=OFF" # No need to use perl-native, the host perl is sufficient. EXTRA_OECMAKE += "-DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl" @@ -34,9 +37,6 @@ EXTRA_OECMAKE += "-DLIBICAL_GLIB_BUILD_DOCS=false" # gobject-introspection EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper" EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper" -EXTRA_OECMAKE += "-DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen" -EXTRA_OECMAKE += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DLIBICAL_GOBJECT_INTROSPECTION=ON -DLIBICAL_GLIB_VAPI=ON', '-DLIBICAL_GOBJECT_INTROSPECTION=OFF -DLIBICAL_GLIB_VAPI=OFF', d)}" -EXTRA_OECMAKE:append:class-native = " -DLIBICAL_GOBJECT_INTROSPECTION=OFF -DLIBICAL_GLIB_VAPI=OFF" # no java EXTRA_OECMAKE += "-DLIBICAL_JAVA_BINDINGS=False" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#245865): https://lists.openembedded.org/g/openembedded-core/message/245865 Mute This Topic: https://lists.openembedded.org/mt/121266589/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
