[OE-core] [PATCH 04/13] libdazzle: fix a build issue with meson 0.49.0

[Kang Kai]

On 2018/12/19 上午12:29, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alex.kanavin at gmail.com>

Hi Alexander,

Have you ever meet build failure on qemumips with libdazzle:

  389 
/home/kkang/buildarea/WRLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/recipe-sysroot/usr/include/glib-2.0/gobject/gobject.h:725: 
syntax error,
      unexpected ')' in '    ((__typeof__(new_object)) (g_object_ref) 
(new_object));' at ')'
  390 qemu: uncaught target signal 11 (Segmentation fault) - core dumped
  391 
/home/kkang/buildarea/WRLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/recipe-sysroot/usr/bin/g-ir-scanner-qemuwrapper: 
line 6: 24294 Segmentati
      on fault      (core dumped) PSEUDO_UNLOAD=1 qemu-mips -r 3.2.0 -L 
/home/kkang/buildarea/WRLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/recipe-
      sysroot -E 
LD_LIBRARY_PATH=$GIR_EXTRA_LIBS_PATH:.libs:/home/kkang/buildarea/WRLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/recipe-sysroot//usr
/lib:/home/kkang/buildarea/WRLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/recipe-sysroot//lib 
"$@"
  392 If the above error message is about missing .so libraries, then 
setting up GIR_EXTRA_LIBS_PATH in the recipe should help.
  393 (typically like this: GIR_EXTRA_LIBS_PATH="${B}/something/.libs" )
  394 Command 
'['/home/kkang/buildarea/WRLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/recipe-sysroot/usr/bin/g-ir-scanner-qemuwrapper', 
'/home/kkang
/buildarea/WRLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/build/tmp-introspecta3rexhyk/Dazzle-1.0', 
'--introspect-dump=/home/kkang/buildarea/W
RLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/build/tmp-introspecta3rexhyk/functions.txt,/home/kkang/buildarea/WRLX-1019/systemd-oe-selftest-D
ec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/build/tmp-introspecta3rexhyk/dump.xml']' 
returned non-zero exit status 1
  395 ninja: build stopped: subcommand failed.
  396 WARNING: 
/home/kkang/buildarea/WRLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/temp/run.do_compile.23419:1 
exit 1 from 'ninja -v -j 32'
  397 ERROR: Function failed: do_compile (log file is located at 
/home/kkang/buildarea/WRLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/temp/log.do_co
      mpile.23419)


The first error has been fixed in gobject-introspection 1.58.2. But I 
didn't find out the root cause of "qemu: uncaught target signal 11 
(Segmentation fault) - core dumped".


Regards,
Kai


> ---
>   ...ine-so-that-gir-compilation-succeeds.patch | 26 +++++++++++++++++++
>   .../libdazzle/libdazzle_3.30.2.bb             |  1 +
>   2 files changed, 27 insertions(+)
>   create mode 100644 meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch
>
> diff --git a/meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch b/meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch
> new file mode 100644
> index 00000000000..c959d43972f
> --- /dev/null
> +++ b/meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch
> @@ -0,0 +1,26 @@
> +From 546d53c3515e8a488a204763437d1fa0917097e5 Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin at gmail.com>
> +Date: Tue, 11 Dec 2018 12:39:30 +0100
> +Subject: [PATCH] Add a define so that gir compilation succeeds
> +
> +For some reason meson 0.49.0 does not anymore pass global arguments to gir compiler.
> +
> +Upstream-Status: Pending
> +Signed-off-by: Alexander Kanavin <alex.kanavin at gmail.com>
> +---
> + src/meson.build | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/meson.build b/src/meson.build
> +index 6ff8a6a..f0b2887 100644
> +--- a/src/meson.build
> ++++ b/src/meson.build
> +@@ -132,7 +132,7 @@ if get_option('with_introspection')
> +         install_dir_gir: girdir,
> +     install_dir_typelib: typelibdir,
> +         export_packages: libdazzle_package,
> +-             extra_args: [ '--c-include=dazzle.h', '--quiet' ],
> ++             extra_args: [ '--c-include=dazzle.h', '--quiet', '-DDAZZLE_COMPILATION' ],
> +   )
> +
> +   if get_option('with_vapi')
> diff --git a/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb b/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb
> index 029adddb9ee..5441c10f990 100644
> --- a/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb
> +++ b/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb
> @@ -7,6 +7,7 @@ inherit gnomebase upstream-version-is-even vala gobject-introspection
>   
>   DEPENDS = "glib-2.0-native glib-2.0 gtk+3"
>   
> +SRC_URI += " file://0001-Add-a-define-so-that-gir-compilation-succeeds.patch"
>   SRC_URI[archive.md5sum] = "24e2e1b914a34f5b8868a9507d1f3c4c"
>   SRC_URI[archive.sha256sum] = "78770eae9fa15ac5acb9c733d29459330b2540affbf72933119e36dbd90b36d5"
>   


-- 
Kai Kang