diff options
Diffstat (limited to 'meta/recipes-gnome/gobject-introspection')
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch | 11 | ||||
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch | 28 | ||||
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-exclude-girepo_dep-if-introspection-data.patch | 25 | ||||
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection_1.80.1.bb (renamed from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb) | 67 |
4 files changed, 33 insertions, 98 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch index 185ebc154a..510bc426d1 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 41c3ee549787333a073a3ce6303efef625c74dce Mon Sep 17 00:00:00 2001 | 1 | From 4e1aa0ddbc43403ff24f644b4c4912b737290c41 Mon Sep 17 00:00:00 2001 |
2 | From: Sascha Silbe <x-yo17@se-silbe.de> | 2 | From: Sascha Silbe <x-yo17@se-silbe.de> |
3 | Date: Fri, 8 Jun 2018 13:55:10 +0200 | 3 | Date: Fri, 8 Jun 2018 13:55:10 +0200 |
4 | Subject: [PATCH] Relocate the repository directory for native builds | 4 | Subject: [PATCH] Relocate the repository directory for native builds |
@@ -14,14 +14,13 @@ cache or sstate mirror). | |||
14 | 14 | ||
15 | Upstream-Status: Inappropriate | 15 | Upstream-Status: Inappropriate |
16 | Signed-off-by: Sascha Silbe <x-yo17@se-silbe.de> | 16 | Signed-off-by: Sascha Silbe <x-yo17@se-silbe.de> |
17 | |||
18 | --- | 17 | --- |
19 | girepository/girepository.c | 15 +++++++++++++-- | 18 | girepository/girepository.c | 15 +++++++++++++-- |
20 | girepository/meson.build | 2 +- | 19 | girepository/meson.build | 2 +- |
21 | 2 files changed, 14 insertions(+), 3 deletions(-) | 20 | 2 files changed, 14 insertions(+), 3 deletions(-) |
22 | 21 | ||
23 | diff --git a/girepository/girepository.c b/girepository/girepository.c | 22 | diff --git a/girepository/girepository.c b/girepository/girepository.c |
24 | index 7d03485..20f4813 100644 | 23 | index 12eaf36..876382c 100644 |
25 | --- a/girepository/girepository.c | 24 | --- a/girepository/girepository.c |
26 | +++ b/girepository/girepository.c | 25 | +++ b/girepository/girepository.c |
27 | @@ -21,6 +21,8 @@ | 26 | @@ -21,6 +21,8 @@ |
@@ -42,7 +41,7 @@ index 7d03485..20f4813 100644 | |||
42 | /** | 41 | /** |
43 | * SECTION:girepository | 42 | * SECTION:girepository |
44 | * @short_description: GObject Introspection repository manager | 43 | * @short_description: GObject Introspection repository manager |
45 | @@ -215,9 +219,16 @@ init_globals (void) | 44 | @@ -222,9 +226,16 @@ init_globals (void) |
46 | g_free (custom_dirs); | 45 | g_free (custom_dirs); |
47 | } | 46 | } |
48 | 47 | ||
@@ -62,10 +61,10 @@ index 7d03485..20f4813 100644 | |||
62 | typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); | 61 | typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); |
63 | 62 | ||
64 | diff --git a/girepository/meson.build b/girepository/meson.build | 63 | diff --git a/girepository/meson.build b/girepository/meson.build |
65 | index c8ef6aa..b85ff7f 100644 | 64 | index 5ced59e..a580d9b 100644 |
66 | --- a/girepository/meson.build | 65 | --- a/girepository/meson.build |
67 | +++ b/girepository/meson.build | 66 | +++ b/girepository/meson.build |
68 | @@ -45,7 +45,7 @@ girepo_internals_lib = static_library('girepository-internals', | 67 | @@ -47,7 +47,7 @@ girepo_internals_lib = static_library('girepository-internals', |
69 | ], | 68 | ], |
70 | c_args: gi_hidden_visibility_cflags + custom_c_args, | 69 | c_args: gi_hidden_visibility_cflags + custom_c_args, |
71 | include_directories : configinc, | 70 | include_directories : configinc, |
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch deleted file mode 100644 index b484b5e9e6..0000000000 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 5 Sep 2018 16:46:52 +0200 | ||
4 | Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper | ||
5 | |||
6 | prelink-rtld, which we use instead of ldd returns 127 when it can't find a library. | ||
7 | It is not an error per se, but it breaks subprocess.check_output(). | ||
8 | |||
9 | Upstream-Status: Inappropriate [oe-core specific] | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | |||
12 | --- | ||
13 | giscanner/shlibs.py | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py | ||
17 | index d67df95..80352a6 100644 | ||
18 | --- a/giscanner/shlibs.py | ||
19 | +++ b/giscanner/shlibs.py | ||
20 | @@ -102,7 +102,7 @@ def _resolve_non_libtool(options, binary, libraries): | ||
21 | args.extend(['otool', '-L', binary.args[0]]) | ||
22 | else: | ||
23 | args.extend(['ldd', binary.args[0]]) | ||
24 | - output = subprocess.check_output(args) | ||
25 | + output = subprocess.run(args, check=False, stdout=subprocess.PIPE).stdout | ||
26 | if isinstance(output, bytes): | ||
27 | output = output.decode("utf-8", "replace") | ||
28 | |||
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-exclude-girepo_dep-if-introspection-data.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-exclude-girepo_dep-if-introspection-data.patch deleted file mode 100644 index 8fba0124cf..0000000000 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-exclude-girepo_dep-if-introspection-data.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From ef5446af0ddad6a341b47957097ac40c6cb5e6d3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 20 Oct 2020 22:40:14 +0200 | ||
4 | Subject: [PATCH] meson.build: exclude girepo_dep if introspection data is | ||
5 | disabled | ||
6 | |||
7 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/248] | ||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | --- | ||
10 | meson.build | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/meson.build b/meson.build | ||
14 | index 14af2b1..a3c27c3 100644 | ||
15 | --- a/meson.build | ||
16 | +++ b/meson.build | ||
17 | @@ -283,7 +283,7 @@ pkg.generate( | ||
18 | # FIXME: meson.override_dependency() and declare_dependency()'s variable arguments | ||
19 | # are new in Meson 0.54.0, older versions of Meson won't be able to use g-i as | ||
20 | # subproject anyway | ||
21 | -if meson.version().version_compare('>=0.54.0') | ||
22 | +if meson.version().version_compare('>=0.54.0') and get_option('build_introspection_data') == true | ||
23 | girepo_dep = declare_dependency( | ||
24 | sources: typelibs, | ||
25 | dependencies: girepo_dep, | ||
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.80.1.bb index ee0ab2866b..582ac248fd 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.80.1.bb | |||
@@ -6,7 +6,7 @@ generation for bindings, API verification and documentation generation." | |||
6 | HOMEPAGE = "https://wiki.gnome.org/action/show/Projects/GObjectIntrospection" | 6 | HOMEPAGE = "https://wiki.gnome.org/action/show/Projects/GObjectIntrospection" |
7 | BUGTRACKER = "https://gitlab.gnome.org/GNOME/gobject-introspection/issues" | 7 | BUGTRACKER = "https://gitlab.gnome.org/GNOME/gobject-introspection/issues" |
8 | SECTION = "libs" | 8 | SECTION = "libs" |
9 | LICENSE = "LGPLv2+ & GPLv2+" | 9 | LICENSE = "LGPL-2.0-or-later & GPL-2.0-or-later & MIT" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ |
11 | file://tools/compiler.c;endline=20;md5=fc5007fc20022720e6c0b0cdde41fabd \ | 11 | file://tools/compiler.c;endline=20;md5=fc5007fc20022720e6c0b0cdde41fabd \ |
12 | file://giscanner/sourcescanner.c;endline=22;md5=194d6e0c1d00662f32d030ce44de8d39 \ | 12 | file://giscanner/sourcescanner.c;endline=22;md5=194d6e0c1d00662f32d030ce44de8d39 \ |
@@ -14,28 +14,26 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ | |||
14 | " | 14 | " |
15 | 15 | ||
16 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ | 16 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ |
17 | file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ | ||
18 | file://0001-meson.build-exclude-girepo_dep-if-introspection-data.patch \ | ||
19 | " | 17 | " |
20 | 18 | ||
21 | SRC_URI[sha256sum] = "dd44a55ee5f426ea22b6b89624708f9e8d53f5cc94e5485c15c87cb30e06161d" | 19 | SRC_URI[sha256sum] = "a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8" |
22 | 20 | ||
23 | SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" | 21 | SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" |
24 | 22 | ||
25 | inherit meson pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even multilib_script | 23 | inherit meson pkgconfig gtk-doc python3targetconfig qemu gobject-introspection-data upstream-version-is-even multilib_script |
26 | 24 | ||
27 | GTKDOC_MESON_OPTION = "gtk_doc" | 25 | GTKDOC_MESON_OPTION = "gtk_doc" |
28 | 26 | ||
29 | MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" | 27 | MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" |
30 | 28 | ||
31 | DEPENDS_append = " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-archive" | 29 | DEPENDS += " libffi zlib python3 flex-native bison-native" |
30 | DEPENDS:append:class-native = " glib-2.0" | ||
31 | DEPENDS:append:class-target = " glib-2.0-initial" | ||
32 | 32 | ||
33 | # target build needs qemu to run temporary introspection binaries created | 33 | # target build needs qemu to run temporary introspection binaries created |
34 | # on the fly by g-ir-scanner and a native version of itself to run | 34 | # on the fly by g-ir-scanner and a native version of itself to run |
35 | # native versions of its own tools during build. | 35 | # native versions of its own tools during build. |
36 | # Also prelink-rtld is used to find out library dependencies of introspection binaries | 36 | DEPENDS:append:class-target = " gobject-introspection-native qemu-native" |
37 | # (standard ldd doesn't work when cross-compiling). | ||
38 | DEPENDS_class-target_append = " gobject-introspection-native qemu-native prelink-native" | ||
39 | 37 | ||
40 | # needed for writing out the qemu wrapper script | 38 | # needed for writing out the qemu wrapper script |
41 | export STAGING_DIR_HOST | 39 | export STAGING_DIR_HOST |
@@ -46,7 +44,7 @@ PACKAGECONFIG[doctool] = "-Ddoctool=enabled,-Ddoctool=disabled,python3-mako," | |||
46 | 44 | ||
47 | # Configure target build to use native tools of itself and to use a qemu wrapper | 45 | # Configure target build to use native tools of itself and to use a qemu wrapper |
48 | # and optionally to generate introspection data | 46 | # and optionally to generate introspection data |
49 | EXTRA_OEMESON_class-target = " \ | 47 | EXTRA_OEMESON:class-target = " \ |
50 | -Dgi_cross_use_prebuilt_gi=true \ | 48 | -Dgi_cross_use_prebuilt_gi=true \ |
51 | -Dgi_cross_binary_wrapper=${B}/g-ir-scanner-qemuwrapper \ | 49 | -Dgi_cross_binary_wrapper=${B}/g-ir-scanner-qemuwrapper \ |
52 | -Dgi_cross_ldd_wrapper=${B}/g-ir-scanner-lddwrapper \ | 50 | -Dgi_cross_ldd_wrapper=${B}/g-ir-scanner-lddwrapper \ |
@@ -55,21 +53,14 @@ EXTRA_OEMESON_class-target = " \ | |||
55 | ${@'-Dgir_dir_prefix=${libdir}' if d.getVar('MULTILIBS') else ''} \ | 53 | ${@'-Dgir_dir_prefix=${libdir}' if d.getVar('MULTILIBS') else ''} \ |
56 | " | 54 | " |
57 | 55 | ||
58 | # Need to ensure ld.so.conf exists so prelink-native works | 56 | do_configure:prepend:class-native() { |
59 | # both before we build and if we install from sstate | ||
60 | do_configure[prefuncs] += "gobject_introspection_preconfigure" | ||
61 | python gobject_introspection_preconfigure () { | ||
62 | oe.utils.write_ld_so_conf(d) | ||
63 | } | ||
64 | |||
65 | do_configure_prepend_class-native() { | ||
66 | # Tweak the native python scripts so that they don't refer to the | 57 | # Tweak the native python scripts so that they don't refer to the |
67 | # full path of native python binary (the solution is taken from glib-2.0 recipe) | 58 | # full path of native python binary (the solution is taken from glib-2.0 recipe) |
68 | # This removes the risk of exceeding Linux kernel's shebang line limit (128 bytes) | 59 | # This removes the risk of exceeding Linux kernel's shebang line limit (128 bytes) |
69 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/tools/g-ir-tool-template.in | 60 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/tools/g-ir-tool-template.in |
70 | } | 61 | } |
71 | 62 | ||
72 | do_configure_prepend_class-target() { | 63 | do_configure:prepend:class-target() { |
73 | # Write out a qemu wrapper that will be given to gi-scanner so that it | 64 | # Write out a qemu wrapper that will be given to gi-scanner so that it |
74 | # can run target helper binaries through that. | 65 | # can run target helper binaries through that. |
75 | qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\\$GIR_EXTRA_LIBS_PATH','.libs','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" | 66 | qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\\$GIR_EXTRA_LIBS_PATH','.libs','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" |
@@ -94,7 +85,7 @@ EOF | |||
94 | # from the target sysroot. | 85 | # from the target sysroot. |
95 | cat > ${B}/g-ir-scanner-wrapper << EOF | 86 | cat > ${B}/g-ir-scanner-wrapper << EOF |
96 | #!/bin/sh | 87 | #!/bin/sh |
97 | # This prevents g-ir-scanner from writing cache data to $HOME | 88 | # This prevents g-ir-scanner from writing cache data to user's HOME dir |
98 | export GI_SCANNER_DISABLE_CACHE=1 | 89 | export GI_SCANNER_DISABLE_CACHE=1 |
99 | 90 | ||
100 | g-ir-scanner --lib-dirs-envvar=GIR_EXTRA_LIBS_PATH --use-binary-wrapper=${STAGING_BINDIR}/g-ir-scanner-qemuwrapper --use-ldd-wrapper=${STAGING_BINDIR}/g-ir-scanner-lddwrapper --add-include-path=${STAGING_DATADIR}/gir-1.0 --add-include-path=${STAGING_LIBDIR}/gir-1.0 "\$@" | 91 | g-ir-scanner --lib-dirs-envvar=GIR_EXTRA_LIBS_PATH --use-binary-wrapper=${STAGING_BINDIR}/g-ir-scanner-qemuwrapper --use-ldd-wrapper=${STAGING_BINDIR}/g-ir-scanner-lddwrapper --add-include-path=${STAGING_DATADIR}/gir-1.0 --add-include-path=${STAGING_LIBDIR}/gir-1.0 "\$@" |
@@ -113,7 +104,7 @@ EOF | |||
113 | # for a different architecture | 104 | # for a different architecture |
114 | cat > ${B}/g-ir-scanner-lddwrapper << EOF | 105 | cat > ${B}/g-ir-scanner-lddwrapper << EOF |
115 | #!/bin/sh | 106 | #!/bin/sh |
116 | prelink-rtld --root=$STAGING_DIR_HOST "\$@" | 107 | \$OBJDUMP -p "\$@" |
117 | EOF | 108 | EOF |
118 | chmod +x ${B}/g-ir-scanner-lddwrapper | 109 | chmod +x ${B}/g-ir-scanner-lddwrapper |
119 | 110 | ||
@@ -122,22 +113,19 @@ EOF | |||
122 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/tools/g-ir-tool-template.in | 113 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/tools/g-ir-tool-template.in |
123 | } | 114 | } |
124 | 115 | ||
125 | do_compile_prepend() { | 116 | do_compile:prepend() { |
126 | # This prevents g-ir-scanner from writing cache data to $HOME | ||
127 | export GI_SCANNER_DISABLE_CACHE=1 | ||
128 | |||
129 | # Needed to run g-ir unit tests, which won't be able to find the built libraries otherwise | 117 | # Needed to run g-ir unit tests, which won't be able to find the built libraries otherwise |
130 | export GIR_EXTRA_LIBS_PATH=$B/.libs | 118 | export GIR_EXTRA_LIBS_PATH=$B/.libs |
131 | } | 119 | } |
132 | 120 | ||
133 | do_install_prepend() { | 121 | do_install:prepend() { |
134 | # This prevents g-ir-scanner from writing cache data to $HOME | 122 | # This prevents g-ir-scanner from writing cache data to $HOME |
135 | export GI_SCANNER_DISABLE_CACHE=1 | 123 | export GI_SCANNER_DISABLE_CACHE=1 |
136 | } | 124 | } |
137 | 125 | ||
138 | # Our wrappers need to be available system-wide, because they will be used | 126 | # Our wrappers need to be available system-wide, because they will be used |
139 | # to build introspection files for all other gobject-based packages | 127 | # to build introspection files for all other gobject-based packages |
140 | do_install_append_class-target() { | 128 | do_install:append:class-target() { |
141 | install -d ${D}${bindir}/ | 129 | install -d ${D}${bindir}/ |
142 | install ${B}/g-ir-scanner-qemuwrapper ${D}${bindir}/ | 130 | install ${B}/g-ir-scanner-qemuwrapper ${D}${bindir}/ |
143 | install ${B}/g-ir-scanner-wrapper ${D}${bindir}/ | 131 | install ${B}/g-ir-scanner-wrapper ${D}${bindir}/ |
@@ -147,9 +135,9 @@ do_install_append_class-target() { | |||
147 | 135 | ||
148 | # we need target versions of introspection tools in sysroot so that they can be run via qemu | 136 | # we need target versions of introspection tools in sysroot so that they can be run via qemu |
149 | # when building introspection files in other packages | 137 | # when building introspection files in other packages |
150 | SYSROOT_DIRS_append_class-target = " ${bindir}" | 138 | SYSROOT_DIRS:append:class-target = " ${bindir}" |
151 | 139 | ||
152 | SYSROOT_PREPROCESS_FUNCS_append_class-target = " gi_binaries_sysroot_preprocess" | 140 | SYSROOT_PREPROCESS_FUNCS:append:class-target = " gi_binaries_sysroot_preprocess" |
153 | gi_binaries_sysroot_preprocess() { | 141 | gi_binaries_sysroot_preprocess() { |
154 | # Tweak the binary names in the introspection pkgconfig file, so that it | 142 | # Tweak the binary names in the introspection pkgconfig file, so that it |
155 | # picks up our wrappers which do the cross-compile and qemu magic. | 143 | # picks up our wrappers which do the cross-compile and qemu magic. |
@@ -159,7 +147,7 @@ gi_binaries_sysroot_preprocess() { | |||
159 | ${SYSROOT_DESTDIR}${libdir}/pkgconfig/gobject-introspection-1.0.pc | 147 | ${SYSROOT_DESTDIR}${libdir}/pkgconfig/gobject-introspection-1.0.pc |
160 | } | 148 | } |
161 | 149 | ||
162 | SYSROOT_PREPROCESS_FUNCS_append = " gi_ldsoconf_sysroot_preprocess" | 150 | SYSROOT_PREPROCESS_FUNCS:append = " gi_ldsoconf_sysroot_preprocess" |
163 | gi_ldsoconf_sysroot_preprocess () { | 151 | gi_ldsoconf_sysroot_preprocess () { |
164 | mkdir -p ${SYSROOT_DESTDIR}${bindir} | 152 | mkdir -p ${SYSROOT_DESTDIR}${bindir} |
165 | dest=${SYSROOT_DESTDIR}${bindir}/postinst-ldsoconf-${PN} | 153 | dest=${SYSROOT_DESTDIR}${bindir}/postinst-ldsoconf-${PN} |
@@ -182,26 +170,27 @@ gi_package_preprocess() { | |||
182 | 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}" | 170 | 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}" |
183 | 171 | ||
184 | # .typelib files are needed at runtime and so they go to the main package | 172 | # .typelib files are needed at runtime and so they go to the main package |
185 | FILES_${PN}_append = " ${libdir}/girepository-*/*.typelib" | 173 | FILES:${PN}:append = " ${libdir}/girepository-*/*.typelib" |
186 | 174 | ||
187 | # .gir files go to dev package, as they're needed for developing (but not for running) | 175 | # .gir files go to dev package, as they're needed for developing (but not for running) |
188 | # things that depends on introspection. | 176 | # things that depends on introspection. |
189 | FILES_${PN}-dev_append = " ${datadir}/gir-*/*.gir ${libdir}/gir-*/*.gir" | 177 | FILES:${PN}-dev:append = " ${datadir}/gir-*/*.gir ${libdir}/gir-*/*.gir" |
190 | FILES_${PN}-dev_append = " ${datadir}/gir-*/*.rnc" | 178 | FILES:${PN}-dev:append = " ${datadir}/gir-*/*.rnc" |
191 | 179 | ||
192 | # These are used by gobject-based packages | 180 | # These are used by gobject-based packages |
193 | # to generate transient introspection binaries | 181 | # to generate transient introspection binaries |
194 | FILES_${PN}-dev_append = " ${datadir}/gobject-introspection-1.0/gdump.c \ | 182 | FILES:${PN}-dev:append = " ${datadir}/gobject-introspection-1.0/gdump.c \ |
195 | ${datadir}/gobject-introspection-1.0/Makefile.introspection" | 183 | ${datadir}/gobject-introspection-1.0/Makefile.introspection" |
196 | 184 | ||
197 | # These are used by dependent packages (e.g. pygobject) to build their | 185 | # These are used by dependent packages (e.g. pygobject) to build their |
198 | # testsuites. | 186 | # testsuites. |
199 | FILES_${PN}-dev_append = " ${datadir}/gobject-introspection-1.0/tests/*.c \ | 187 | FILES:${PN}-dev:append = " ${datadir}/gobject-introspection-1.0/tests/*.c \ |
200 | ${datadir}/gobject-introspection-1.0/tests/*.h" | 188 | ${datadir}/gobject-introspection-1.0/tests/*.h" |
201 | 189 | ||
202 | FILES_${PN}-dbg += "${libdir}/gobject-introspection/giscanner/.debug/" | 190 | FILES:${PN}-dbg += "${libdir}/gobject-introspection/giscanner/.debug/" |
203 | FILES_${PN}-staticdev += "${libdir}/gobject-introspection/giscanner/*.a" | 191 | FILES:${PN}-staticdev += "${libdir}/gobject-introspection/giscanner/*.a" |
204 | 192 | ||
205 | RDEPENDS_${PN} = "python3-pickle python3-xml" | 193 | # setuptools can be removed when upstream removes all uses of distutils |
194 | RDEPENDS:${PN} = "python3-pickle python3-xml python3-setuptools glib-2.0" | ||
206 | 195 | ||
207 | BBCLASSEXTEND = "native" | 196 | BBCLASSEXTEND = "native" |