mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 16:27:27 +00:00
Markus Volk
3b32cfc181
Switch from using tarball to git because the 2.3.2 tarball lacks the meson_options.txt file. Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
51 lines
2.3 KiB
Diff
51 lines
2.3 KiB
Diff
From 37f24a9bd62f0a8f3e37eaddd33f2f0c9d3aaa0a Mon Sep 17 00:00:00 2001
|
|
From: Chen Qi <Qi.Chen@windriver.com>
|
|
Date: Fri, 1 Apr 2022 23:12:17 -0700
|
|
Subject: [PATCH] meson: add pythoninstalldir option
|
|
|
|
In case of cross build, using host python to determine the python
|
|
site-packages directory for target is not feasible, add a new option
|
|
pythoninstalldir to fix the issue.
|
|
|
|
Upstream-Status: Submitted [https://github.com/blueman-project/blueman/pull/1699]
|
|
|
|
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
|
---
|
|
meson.build | 7 ++++++-
|
|
meson_options.txt | 1 +
|
|
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index e12d0ce6..e84457a5 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -26,7 +26,12 @@ pkgdatadir = join_paths([prefix, get_option('datadir'), package_name])
|
|
bindir = join_paths([prefix, get_option('bindir')])
|
|
libexecdir = join_paths([prefix, get_option('libexecdir')])
|
|
schemadir = join_paths(['share', 'glib-2.0', 'schemas'])
|
|
-pythondir = pyinstall.get_install_dir()
|
|
+pythoninstalldir = get_option('pythoninstalldir')
|
|
+if pythoninstalldir != ''
|
|
+ pythondir = join_paths([prefix, pythoninstalldir])
|
|
+else
|
|
+ pythondir = join_paths([prefix, python.sysconfig_path('purelib')])
|
|
+endif
|
|
|
|
if get_option('policykit')
|
|
have_polkit = 'True'
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
|
index 177d9ab8..3e397d8e 100644
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -2,6 +2,7 @@ option('runtime_deps_check', type: 'boolean', value: true, description: 'Disable
|
|
option('dhcp-config-path', type: 'string', value: '/etc/dhcp3/dhcpd.conf', description: 'Set dhcp3 server configuration path')
|
|
option('policykit', type: 'boolean', value: true, description: 'Enable policykit support')
|
|
option('pulseaudio', type: 'boolean', value: true, description: 'Enable PulseAudio support')
|
|
+option('pythoninstalldir', type: 'string', description: 'Path to python site-packages dir relative to ${prefix}')
|
|
option('systemdsystemunitdir', type: 'string', description: 'Path to systemd system unit dir relative to ${prefix}')
|
|
option('systemduserunitdir', type: 'string', description: 'Path to systemd user unit dir relative to ${prefix}')
|
|
option('sendto-plugins', type: 'array', choices: ['Caja', 'Nemo', 'Nautilus'], value: ['Caja', 'Nemo', 'Nautilus'], description: 'Install sendto plugins for various filemanagers')
|
|
--
|
|
2.34.1
|
|
|