forked from brl/citadel
Bruce Leidl
4c3baa433b
Updated Recipes
* dash-to-panel 40
* dconf 0.38.0
* gdm 3.38.0
* glib 2.66.1
* gjs 1.66.0
* gnome-autoar 0.2.4
* gnome-backgrounds 3.38.0
* gnome-bluetooth 3.34.3
* gnome-control-center 3.38.1
* gnome-screenshot 3.38.0
* gnome-shell 3.38.1
* gnome-session 3.38.0
* gnome-settings-daemon 3.38.0
* gnome-terminal 3.38.0
* gnome-usage 3.38.0
* graphene 1.10.2
* gsettings-desktop-schema 3.38.0
* gvfs 1.46.1
* iwd 1.9
* libgee 0.20.3
* libgtop 2.40.0
* libgweather 3.36.1
* mkpasswd 5.5.7
* mozjs 78.0.1
* mutter 3.38.1
* nautilus 3.38.1
* networkmanager 1.26.4
* polkit 0.118
* tracker 3.0.1
* vte 0.62.0
Removed because recipes exist in poky with adequate version
* atk, at-spi
* clutter
* clutter-gtk
* cogl
* ell
* gcr
* itstool
* libinput
* pango
Other removed recipes
* systemd-initrd No longer using a separate systemd recipe
for initramfs
* caribou What even is this
* gnome-tweaks Not used
* mozjs Polkit no longer requires an ancient mozjs
* mozjs68 Upgraded to mozjs78
46 lines
2.0 KiB
Diff
46 lines
2.0 KiB
Diff
From 214e559d394491b1376e4cc370f75151117a3f83 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
Date: Thu, 18 Apr 2019 17:36:11 +0200
|
|
Subject: [PATCH] modules/python.py: do not substitute python's install prefix
|
|
with meson's
|
|
|
|
Not sure why this is being done, but it
|
|
a) relies on Python's internal variable substitution which may break in the future
|
|
b) shouldn't be necessary as Python's prefix ought to be correct in the first place
|
|
|
|
Upstream-Status: Pending
|
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
|
|
---
|
|
mesonbuild/modules/python.py | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
|
|
index 2f0c644..d2aa565 100644
|
|
--- a/mesonbuild/modules/python.py
|
|
+++ b/mesonbuild/modules/python.py
|
|
@@ -251,7 +251,7 @@ INTROSPECT_COMMAND = '''import sysconfig
|
|
import json
|
|
import sys
|
|
|
|
-install_paths = sysconfig.get_paths(scheme='posix_prefix', vars={'base': '', 'platbase': '', 'installed_base': ''})
|
|
+install_paths = sysconfig.get_paths(scheme='posix_prefix')
|
|
|
|
def links_against_libpython():
|
|
from distutils.core import Distribution, Extension
|
|
@@ -276,12 +276,11 @@ class PythonInstallation(ExternalProgramHolder):
|
|
ExternalProgramHolder.__init__(self, python, interpreter.subproject)
|
|
self.interpreter = interpreter
|
|
self.subproject = self.interpreter.subproject
|
|
- prefix = self.interpreter.environment.coredata.get_builtin_option('prefix')
|
|
self.variables = info['variables']
|
|
self.paths = info['paths']
|
|
install_paths = info['install_paths']
|
|
- self.platlib_install_path = os.path.join(prefix, install_paths['platlib'][1:])
|
|
- self.purelib_install_path = os.path.join(prefix, install_paths['purelib'][1:])
|
|
+ self.platlib_install_path = install_paths['platlib']
|
|
+ self.purelib_install_path = install_paths['purelib']
|
|
self.version = info['version']
|
|
self.platform = info['platform']
|
|
self.is_pypy = info['is_pypy']
|