code.ossystems Code Review - openembedded-core.git/blob

   1 From be8a47e0c21e5577d4f5669d339dfec6299b25be Mon Sep 17 00:00:00 2001
   2 From: Alexander Kanavin <alex.kanavin@gmail.com>
   3 Date: Thu, 14 Feb 2019 18:06:25 +0100
   4 Subject: [PATCH] Generate loaders.cache using a native tool when
   5  cross-compiling
   6
   7 Otherwise meson would attempt to run a target binary.
   8
   9 Upstream-Status: Pending
  10 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  11
  12 ---
  13  gdk-pixbuf/meson.build | 12 ++++++++++--
  14  1 file changed, 10 insertions(+), 2 deletions(-)
  15
  16 diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
  17 index 5cddbec..78c8bd3 100644
  18 --- a/gdk-pixbuf/meson.build
  19 +++ b/gdk-pixbuf/meson.build
  20 @@ -324,8 +324,16 @@ if not meson.is_cross_build()
  21                                  build_by_default: true)
  22    loaders_dep = declare_dependency(sources: [ loaders_cache ])
  23  else
  24 -  loaders_cache = []
  25 -  loaders_dep = declare_dependency()
  26 +  loaders_cache = custom_target('loaders.cache',
  27 +                                output: 'loaders.cache',
  28 +                                capture: true,
  29 +                                command: [
  30 +                                  'gdk-pixbuf-query-loaders',
  31 +                                  dynamic_loaders,
  32 +                                ],
  33 +                                depends: dynamic_loaders_dep,
  34 +                                build_by_default: true)
  35 +  loaders_dep = declare_dependency(sources: [ loaders_cache ])
  36  endif
  37
  38  pkgconfig = import('pkgconfig')