summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch')
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
deleted file mode 100644
index d1fdc068c0..0000000000
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 8a57aa0ac6c2f00b9b7a7fc177431f7643399e70 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 23 Mar 2016 17:07:28 +0200
4Subject: [PATCH] Revert an incomplete upstream attempt at cross-compile
5 support
6
7Upstream-Status: Pending
8Signed-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
15diff --git a/common.mk b/common.mk
16index 64fb02f..77e819d 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 = \
32diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py
33index 1730fee..26bab84 100644
34--- a/giscanner/gdumpparser.py
35+++ b/giscanner/gdumpparser.py
36@@ -156,12 +156,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