summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/vala
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-devtools/vala
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz
Convert to new override syntax
This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/vala')
-rw-r--r--meta/recipes-devtools/vala/vala.inc16
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc
index 71da2ef07c..1a1115739d 100644
--- a/meta/recipes-devtools/vala/vala.inc
+++ b/meta/recipes-devtools/vala/vala.inc
@@ -8,10 +8,10 @@ DEPENDS = "bison-native flex-native glib-2.0"
8# Appending libxslt-native to dependencies has an effect 8# Appending libxslt-native to dependencies has an effect
9# of rebuilding the manual, which is very slow. Let's do this 9# of rebuilding the manual, which is very slow. Let's do this
10# only when api-documentation distro feature is enabled. 10# only when api-documentation distro feature is enabled.
11DEPENDS_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'libxslt-native', '', d)}" 11DEPENDS:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'libxslt-native', '', d)}"
12 12
13# vala-native contains a native version of vapigen, which we use instead of the target one 13# vala-native contains a native version of vapigen, which we use instead of the target one
14DEPENDS_append_class-target = " vala-native" 14DEPENDS:append:class-target = " vala-native"
15BBCLASSEXTEND = "native" 15BBCLASSEXTEND = "native"
16LICENSE = "LGPLv2.1" 16LICENSE = "LGPLv2.1"
17LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" 17LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
@@ -21,13 +21,13 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
21SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz" 21SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz"
22inherit autotools pkgconfig upstream-version-is-even 22inherit autotools pkgconfig upstream-version-is-even
23 23
24FILES_${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi ${libdir}/${BPN}-${SHRT_VER}/" 24FILES:${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi ${libdir}/${BPN}-${SHRT_VER}/"
25FILES_${PN}-doc += "${datadir}/devhelp" 25FILES:${PN}-doc += "${datadir}/devhelp"
26 26
27# .gir files from gobject-introspection are installed to ${libdir} when multilib is enabled 27# .gir files from gobject-introspection are installed to ${libdir} when multilib is enabled
28GIRDIR_OPT = "${@'--girdir=${STAGING_LIBDIR}/gir-1.0' if d.getVar('MULTILIBS') else ''}" 28GIRDIR_OPT = "${@'--girdir=${STAGING_LIBDIR}/gir-1.0' if d.getVar('MULTILIBS') else ''}"
29 29
30do_configure_prepend_class-target() { 30do_configure:prepend:class-target() {
31 # Write out a vapigen wrapper that will be provided by pkg-config file installed in target sysroot 31 # Write out a vapigen wrapper that will be provided by pkg-config file installed in target sysroot
32 # The wrapper will call a native vapigen 32 # The wrapper will call a native vapigen
33 cat > ${B}/vapigen-wrapper << EOF 33 cat > ${B}/vapigen-wrapper << EOF
@@ -41,16 +41,16 @@ EXTRA_OECONF += " --disable-valadoc"
41 41
42# Vapigen wrapper needs to be available system-wide, because it will be used 42# Vapigen wrapper needs to be available system-wide, because it will be used
43# to build vapi files from all other packages with vala support 43# to build vapi files from all other packages with vala support
44do_install_append_class-target() { 44do_install:append:class-target() {
45 install -d ${D}${bindir}/ 45 install -d ${D}${bindir}/
46 install ${B}/vapigen-wrapper ${D}${bindir}/ 46 install ${B}/vapigen-wrapper ${D}${bindir}/
47} 47}
48 48
49# Put vapigen wrapper into target sysroot so that it can be used when building 49# Put vapigen wrapper into target sysroot so that it can be used when building
50# vapi files. 50# vapi files.
51SYSROOT_DIRS_append_class-target = " ${bindir}" 51SYSROOT_DIRS:append:class-target = " ${bindir}"
52 52
53SYSROOT_PREPROCESS_FUNCS_append_class-target = " vapigen_sysroot_preprocess" 53SYSROOT_PREPROCESS_FUNCS:append:class-target = " vapigen_sysroot_preprocess"
54vapigen_sysroot_preprocess() { 54vapigen_sysroot_preprocess() {
55 # Tweak the vapigen name in the vapigen pkgconfig file, so that it picks 55 # Tweak the vapigen name in the vapigen pkgconfig file, so that it picks
56 # up our wrapper. 56 # up our wrapper.