[gobject-introspection/wip/meson: 12/14] Revert "meson: Handle spaces in the full python path"
- From: Nirbheek Chauhan <nirbheekc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection/wip/meson: 12/14] Revert "meson: Handle spaces in the full python path"
- Date: Thu, 30 Nov 2017 17:14:42 +0000 (UTC)
commit 6354407ac98e79d3c67292077be4cb5a797c848c
Author: Nirbheek Chauhan <nirbheek centricular com>
Date: Thu Nov 30 00:25:46 2017 +0530
Revert "meson: Handle spaces in the full python path"
This reverts commit f473d3b3ede94639f8d68fe618cc4cd287053181.
This can cause Meson to run g-ir-scanner with the wrong python; for
instance if you built gobject-introspection with a 64-bit Python but
you have a 32-bit Python in your PATH.
The correct fix is https://github.com/mesonbuild/meson/pull/2708.
tools/meson.build | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/tools/meson.build b/tools/meson.build
index 1b4c6e9..e32937b 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -1,11 +1,6 @@
libdir_abs = join_paths(get_option('prefix'), get_option('libdir'))
datadir_abs = join_paths(get_option('prefix'), get_option('datadir'))
python_path = python3.path()
-# If there is a space in the path to python, we cannot use it in the shebang
-# since there is no way to quote spaces. Use the basename instead.
-if python_path.contains(' ')
- python_path = python_path.split('/')[-1]
-endif
tools = [
['g-ir-scanner', 'scannermain', 'scanner_main'],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]