diff options
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.patch | 50 |
1 files changed, 50 insertions, 0 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 new file mode 100644 index 0000000000..9abaea7e7f --- /dev/null +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From 3a9d1e5ee0aae56fafec0beba2014c19e4ff310c 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 1/5] 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 | common.mk | 4 ---- | ||
11 | giscanner/gdumpparser.py | 6 ------ | ||
12 | 2 files changed, 10 deletions(-) | ||
13 | |||
14 | diff --git a/common.mk b/common.mk | ||
15 | index b778f7a..e26c637 100644 | ||
16 | --- a/common.mk | ||
17 | +++ b/common.mk | ||
18 | @@ -24,12 +24,8 @@ INTROSPECTION_SCANNER_ARGS = \ | ||
19 | --add-include-path=$(top_builddir) \ | ||
20 | --add-include-path=$(top_builddir)/gir | ||
21 | |||
22 | -# GI_CROSS_LAUNCHER is the command to use for executing g-ir-compiler. | ||
23 | -# Normally will be undefined but can be set (e.g. to wine or qemu) | ||
24 | -# when cross-compiling | ||
25 | INTROSPECTION_COMPILER = \ | ||
26 | env PATH=".libs:$(PATH)" \ | ||
27 | - $(GI_CROSS_LAUNCHER) \ | ||
28 | $(top_builddir)/g-ir-compiler$(EXEEXT) | ||
29 | |||
30 | INTROSPECTION_COMPILER_ARGS = \ | ||
31 | diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py | ||
32 | index 1134f33..9bdc2bc 100644 | ||
33 | --- a/giscanner/gdumpparser.py | ||
34 | +++ b/giscanner/gdumpparser.py | ||
35 | @@ -162,12 +162,6 @@ blob containing data gleaned from GObject's primitive introspection.""" | ||
36 | out_path = os.path.join(self._binary.tmpdir, 'dump.xml') | ||
37 | |||
38 | args = [] | ||
39 | - | ||
40 | - # Prepend the launcher command and arguments, if defined | ||
41 | - launcher = os.environ.get('GI_CROSS_LAUNCHER') | ||
42 | - if launcher: | ||
43 | - args.extend(launcher.split()) | ||
44 | - | ||
45 | args.extend(self._binary.args) | ||
46 | args.append('--introspect-dump=%s,%s' % (in_path, out_path)) | ||
47 | |||
48 | -- | ||
49 | 2.7.0 | ||
50 | |||