diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-gnome/gobject-introspection | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-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-gnome/gobject-introspection')
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb index 048deabe64..cf1349f830 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb | |||
@@ -19,7 +19,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$ | |||
19 | 19 | ||
20 | SRC_URI[sha256sum] = "d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27" | 20 | SRC_URI[sha256sum] = "d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27" |
21 | 21 | ||
22 | SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" | 22 | SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" |
23 | 23 | ||
24 | inherit meson pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even multilib_script | 24 | inherit meson pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even multilib_script |
25 | 25 | ||
@@ -34,7 +34,7 @@ DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-arch | |||
34 | # native versions of its own tools during build. | 34 | # native versions of its own tools during build. |
35 | # Also prelink-rtld is used to find out library dependencies of introspection binaries | 35 | # Also prelink-rtld is used to find out library dependencies of introspection binaries |
36 | # (standard ldd doesn't work when cross-compiling). | 36 | # (standard ldd doesn't work when cross-compiling). |
37 | DEPENDS_append_class-target = " gobject-introspection-native qemu-native prelink-native" | 37 | DEPENDS:append:class-target = " gobject-introspection-native qemu-native prelink-native" |
38 | 38 | ||
39 | # needed for writing out the qemu wrapper script | 39 | # needed for writing out the qemu wrapper script |
40 | export STAGING_DIR_HOST | 40 | export STAGING_DIR_HOST |
@@ -45,7 +45,7 @@ PACKAGECONFIG[doctool] = "-Ddoctool=enabled,-Ddoctool=disabled,python3-mako," | |||
45 | 45 | ||
46 | # Configure target build to use native tools of itself and to use a qemu wrapper | 46 | # Configure target build to use native tools of itself and to use a qemu wrapper |
47 | # and optionally to generate introspection data | 47 | # and optionally to generate introspection data |
48 | EXTRA_OEMESON_class-target = " \ | 48 | EXTRA_OEMESON:class-target = " \ |
49 | -Dgi_cross_use_prebuilt_gi=true \ | 49 | -Dgi_cross_use_prebuilt_gi=true \ |
50 | -Dgi_cross_binary_wrapper=${B}/g-ir-scanner-qemuwrapper \ | 50 | -Dgi_cross_binary_wrapper=${B}/g-ir-scanner-qemuwrapper \ |
51 | -Dgi_cross_ldd_wrapper=${B}/g-ir-scanner-lddwrapper \ | 51 | -Dgi_cross_ldd_wrapper=${B}/g-ir-scanner-lddwrapper \ |
@@ -61,14 +61,14 @@ python gobject_introspection_preconfigure () { | |||
61 | oe.utils.write_ld_so_conf(d) | 61 | oe.utils.write_ld_so_conf(d) |
62 | } | 62 | } |
63 | 63 | ||
64 | do_configure_prepend_class-native() { | 64 | do_configure:prepend:class-native() { |
65 | # Tweak the native python scripts so that they don't refer to the | 65 | # Tweak the native python scripts so that they don't refer to the |
66 | # full path of native python binary (the solution is taken from glib-2.0 recipe) | 66 | # full path of native python binary (the solution is taken from glib-2.0 recipe) |
67 | # This removes the risk of exceeding Linux kernel's shebang line limit (128 bytes) | 67 | # This removes the risk of exceeding Linux kernel's shebang line limit (128 bytes) |
68 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/tools/g-ir-tool-template.in | 68 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/tools/g-ir-tool-template.in |
69 | } | 69 | } |
70 | 70 | ||
71 | do_configure_prepend_class-target() { | 71 | do_configure:prepend:class-target() { |
72 | # Write out a qemu wrapper that will be given to gi-scanner so that it | 72 | # Write out a qemu wrapper that will be given to gi-scanner so that it |
73 | # can run target helper binaries through that. | 73 | # can run target helper binaries through that. |
74 | qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\\$GIR_EXTRA_LIBS_PATH','.libs','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" | 74 | qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\\$GIR_EXTRA_LIBS_PATH','.libs','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" |
@@ -121,7 +121,7 @@ EOF | |||
121 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/tools/g-ir-tool-template.in | 121 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/tools/g-ir-tool-template.in |
122 | } | 122 | } |
123 | 123 | ||
124 | do_compile_prepend() { | 124 | do_compile:prepend() { |
125 | # This prevents g-ir-scanner from writing cache data to $HOME | 125 | # This prevents g-ir-scanner from writing cache data to $HOME |
126 | export GI_SCANNER_DISABLE_CACHE=1 | 126 | export GI_SCANNER_DISABLE_CACHE=1 |
127 | 127 | ||
@@ -129,14 +129,14 @@ do_compile_prepend() { | |||
129 | export GIR_EXTRA_LIBS_PATH=$B/.libs | 129 | export GIR_EXTRA_LIBS_PATH=$B/.libs |
130 | } | 130 | } |
131 | 131 | ||
132 | do_install_prepend() { | 132 | do_install:prepend() { |
133 | # This prevents g-ir-scanner from writing cache data to $HOME | 133 | # This prevents g-ir-scanner from writing cache data to $HOME |
134 | export GI_SCANNER_DISABLE_CACHE=1 | 134 | export GI_SCANNER_DISABLE_CACHE=1 |
135 | } | 135 | } |
136 | 136 | ||
137 | # Our wrappers need to be available system-wide, because they will be used | 137 | # Our wrappers need to be available system-wide, because they will be used |
138 | # to build introspection files for all other gobject-based packages | 138 | # to build introspection files for all other gobject-based packages |
139 | do_install_append_class-target() { | 139 | do_install:append:class-target() { |
140 | install -d ${D}${bindir}/ | 140 | install -d ${D}${bindir}/ |
141 | install ${B}/g-ir-scanner-qemuwrapper ${D}${bindir}/ | 141 | install ${B}/g-ir-scanner-qemuwrapper ${D}${bindir}/ |
142 | install ${B}/g-ir-scanner-wrapper ${D}${bindir}/ | 142 | install ${B}/g-ir-scanner-wrapper ${D}${bindir}/ |
@@ -146,9 +146,9 @@ do_install_append_class-target() { | |||
146 | 146 | ||
147 | # we need target versions of introspection tools in sysroot so that they can be run via qemu | 147 | # we need target versions of introspection tools in sysroot so that they can be run via qemu |
148 | # when building introspection files in other packages | 148 | # when building introspection files in other packages |
149 | SYSROOT_DIRS_append_class-target = " ${bindir}" | 149 | SYSROOT_DIRS:append:class-target = " ${bindir}" |
150 | 150 | ||
151 | SYSROOT_PREPROCESS_FUNCS_append_class-target = " gi_binaries_sysroot_preprocess" | 151 | SYSROOT_PREPROCESS_FUNCS:append:class-target = " gi_binaries_sysroot_preprocess" |
152 | gi_binaries_sysroot_preprocess() { | 152 | gi_binaries_sysroot_preprocess() { |
153 | # Tweak the binary names in the introspection pkgconfig file, so that it | 153 | # Tweak the binary names in the introspection pkgconfig file, so that it |
154 | # picks up our wrappers which do the cross-compile and qemu magic. | 154 | # picks up our wrappers which do the cross-compile and qemu magic. |
@@ -158,7 +158,7 @@ gi_binaries_sysroot_preprocess() { | |||
158 | ${SYSROOT_DESTDIR}${libdir}/pkgconfig/gobject-introspection-1.0.pc | 158 | ${SYSROOT_DESTDIR}${libdir}/pkgconfig/gobject-introspection-1.0.pc |
159 | } | 159 | } |
160 | 160 | ||
161 | SYSROOT_PREPROCESS_FUNCS_append = " gi_ldsoconf_sysroot_preprocess" | 161 | SYSROOT_PREPROCESS_FUNCS:append = " gi_ldsoconf_sysroot_preprocess" |
162 | gi_ldsoconf_sysroot_preprocess () { | 162 | gi_ldsoconf_sysroot_preprocess () { |
163 | mkdir -p ${SYSROOT_DESTDIR}${bindir} | 163 | mkdir -p ${SYSROOT_DESTDIR}${bindir} |
164 | dest=${SYSROOT_DESTDIR}${bindir}/postinst-ldsoconf-${PN} | 164 | dest=${SYSROOT_DESTDIR}${bindir}/postinst-ldsoconf-${PN} |
@@ -181,26 +181,26 @@ gi_package_preprocess() { | |||
181 | SSTATE_SCAN_FILES += "g-ir-scanner-qemuwrapper g-ir-scanner-wrapper g-ir-compiler-wrapper g-ir-scanner-lddwrapper Gio-2.0.gir postinst-ldsoconf-${PN}" | 181 | SSTATE_SCAN_FILES += "g-ir-scanner-qemuwrapper g-ir-scanner-wrapper g-ir-compiler-wrapper g-ir-scanner-lddwrapper Gio-2.0.gir postinst-ldsoconf-${PN}" |
182 | 182 | ||
183 | # .typelib files are needed at runtime and so they go to the main package | 183 | # .typelib files are needed at runtime and so they go to the main package |
184 | FILES_${PN}_append = " ${libdir}/girepository-*/*.typelib" | 184 | FILES:${PN}:append = " ${libdir}/girepository-*/*.typelib" |
185 | 185 | ||
186 | # .gir files go to dev package, as they're needed for developing (but not for running) | 186 | # .gir files go to dev package, as they're needed for developing (but not for running) |
187 | # things that depends on introspection. | 187 | # things that depends on introspection. |
188 | FILES_${PN}-dev_append = " ${datadir}/gir-*/*.gir ${libdir}/gir-*/*.gir" | 188 | FILES:${PN}-dev:append = " ${datadir}/gir-*/*.gir ${libdir}/gir-*/*.gir" |
189 | FILES_${PN}-dev_append = " ${datadir}/gir-*/*.rnc" | 189 | FILES:${PN}-dev:append = " ${datadir}/gir-*/*.rnc" |
190 | 190 | ||
191 | # These are used by gobject-based packages | 191 | # These are used by gobject-based packages |
192 | # to generate transient introspection binaries | 192 | # to generate transient introspection binaries |
193 | FILES_${PN}-dev_append = " ${datadir}/gobject-introspection-1.0/gdump.c \ | 193 | FILES:${PN}-dev:append = " ${datadir}/gobject-introspection-1.0/gdump.c \ |
194 | ${datadir}/gobject-introspection-1.0/Makefile.introspection" | 194 | ${datadir}/gobject-introspection-1.0/Makefile.introspection" |
195 | 195 | ||
196 | # These are used by dependent packages (e.g. pygobject) to build their | 196 | # These are used by dependent packages (e.g. pygobject) to build their |
197 | # testsuites. | 197 | # testsuites. |
198 | FILES_${PN}-dev_append = " ${datadir}/gobject-introspection-1.0/tests/*.c \ | 198 | FILES:${PN}-dev:append = " ${datadir}/gobject-introspection-1.0/tests/*.c \ |
199 | ${datadir}/gobject-introspection-1.0/tests/*.h" | 199 | ${datadir}/gobject-introspection-1.0/tests/*.h" |
200 | 200 | ||
201 | FILES_${PN}-dbg += "${libdir}/gobject-introspection/giscanner/.debug/" | 201 | FILES:${PN}-dbg += "${libdir}/gobject-introspection/giscanner/.debug/" |
202 | FILES_${PN}-staticdev += "${libdir}/gobject-introspection/giscanner/*.a" | 202 | FILES:${PN}-staticdev += "${libdir}/gobject-introspection/giscanner/*.a" |
203 | 203 | ||
204 | RDEPENDS_${PN} = "python3-pickle python3-xml" | 204 | RDEPENDS:${PN} = "python3-pickle python3-xml" |
205 | 205 | ||
206 | BBCLASSEXTEND = "native" | 206 | BBCLASSEXTEND = "native" |