49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
|
From ca0fb17e268c176ac89df081b1efa4a42989f014 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||
|
|
Date: Wed, 23 Mar 2016 17:07:28 +0200
|
||
|
|
Subject: [PATCH] Revert an incomplete upstream attempt at cross-compile
|
||
|
|
support
|
||
|
|
|
||
|
|
Upstream-Status: Pending
|
||
|
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||
|
|
|
||
|
|
---
|
||
|
|
common.mk | 4 ----
|
||
|
|
giscanner/gdumpparser.py | 6 ------
|
||
|
|
2 files changed, 10 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/common.mk b/common.mk
|
||
|
|
index b778f7a..e26c637 100644
|
||
|
|
--- a/common.mk
|
||
|
|
+++ b/common.mk
|
||
|
|
@@ -24,12 +24,8 @@ INTROSPECTION_SCANNER_ARGS = \
|
||
|
|
--add-include-path=$(top_builddir) \
|
||
|
|
--add-include-path=$(top_builddir)/gir
|
||
|
|
|
||
|
|
-# GI_CROSS_LAUNCHER is the command to use for executing g-ir-compiler.
|
||
|
|
-# Normally will be undefined but can be set (e.g. to wine or qemu)
|
||
|
|
-# when cross-compiling
|
||
|
|
INTROSPECTION_COMPILER = \
|
||
|
|
env PATH=".libs:$(PATH)" \
|
||
|
|
- $(GI_CROSS_LAUNCHER) \
|
||
|
|
$(top_builddir)/g-ir-compiler$(EXEEXT)
|
||
|
|
|
||
|
|
INTROSPECTION_COMPILER_ARGS = \
|
||
|
|
diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py
|
||
|
|
index cd9d94d..b41772c 100644
|
||
|
|
--- a/giscanner/gdumpparser.py
|
||
|
|
+++ b/giscanner/gdumpparser.py
|
||
|
|
@@ -161,12 +161,6 @@ blob containing data gleaned from GObject's primitive introspection."""
|
||
|
|
out_path = os.path.join(self._binary.tmpdir, 'dump.xml')
|
||
|
|
|
||
|
|
args = []
|
||
|
|
-
|
||
|
|
- # Prepend the launcher command and arguments, if defined
|
||
|
|
- launcher = os.environ.get('GI_CROSS_LAUNCHER')
|
||
|
|
- if launcher:
|
||
|
|
- args.extend(launcher.split())
|
||
|
|
-
|
||
|
|
args.extend(self._binary.args)
|
||
|
|
args.append('--introspect-dump=%s,%s' % (in_path, out_path))
|
||
|
|
|