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

   1 From ca0fb17e268c176ac89df081b1efa4a42989f014 Mon Sep 17 00:00:00 2001
   2 From: Alexander Kanavin <alex.kanavin@gmail.com>
   3 Date: Wed, 23 Mar 2016 17:07:28 +0200
   4 Subject: [PATCH] Revert an incomplete upstream attempt at cross-compile
   5  support
   6
   7 Upstream-Status: Pending
   8 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
   9
  10 ---
  11  common.mk                | 4 ----
  12  giscanner/gdumpparser.py | 6 ------
  13  2 files changed, 10 deletions(-)
  14
  15 diff --git a/common.mk b/common.mk
  16 index b778f7a..e26c637 100644
  17 --- a/common.mk
  18 +++ b/common.mk
  19 @@ -24,12 +24,8 @@ INTROSPECTION_SCANNER_ARGS = \
  20      --add-include-path=$(top_builddir) \
  21      --add-include-path=$(top_builddir)/gir
  22
  23 -# GI_CROSS_LAUNCHER is the command to use for executing g-ir-compiler.
  24 -# Normally will be undefined but can be set (e.g. to wine or qemu)
  25 -# when cross-compiling
  26  INTROSPECTION_COMPILER = \
  27      env PATH=".libs:$(PATH)" \
  28 -        $(GI_CROSS_LAUNCHER) \
  29          $(top_builddir)/g-ir-compiler$(EXEEXT)
  30
  31  INTROSPECTION_COMPILER_ARGS = \
  32 diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py
  33 index cd9d94d..b41772c 100644
  34 --- a/giscanner/gdumpparser.py
  35 +++ b/giscanner/gdumpparser.py
  36 @@ -161,12 +161,6 @@ blob containing data gleaned from GObject's primitive introspection."""
  37          out_path = os.path.join(self._binary.tmpdir, 'dump.xml')
  38
  39          args = []
  40 -
  41 -        # Prepend the launcher command and arguments, if defined
  42 -        launcher = os.environ.get('GI_CROSS_LAUNCHER')
  43 -        if launcher:
  44 -            args.extend(launcher.split())
  45 -
  46          args.extend(self._binary.args)
  47          args.append('--introspect-dump=%s,%s' % (in_path, out_path))
  48