diff options
Diffstat (limited to 'meta/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch')
-rw-r--r-- | meta/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch b/meta/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch new file mode 100644 index 0000000000..d3c26d97ae --- /dev/null +++ b/meta/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 9b67bb18d8409e0e693cc6000507acbd73a30eab Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Wed, 16 Nov 2022 11:27:24 +0100 | ||
4 | Subject: [PATCH 1/2] meson.build: correctly handle disabled ssh_agent option | ||
5 | |||
6 | Existing code produces these errors: | ||
7 | | gcr/meson.build:61:0: ERROR: Unable to get the path of a not-found external program | ||
8 | | gcr/meson.build:101:5: ERROR: Unknown variable "ssh_add_path". | ||
9 | |||
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
11 | |||
12 | Upstream-Status: Backport [ https://gitlab.gnome.org/GNOME/gcr/-/commit/9b67bb18d8409e0e693cc6000507acbd73a30eab ] | ||
13 | --- | ||
14 | meson.build | 12 ++++++++---- | ||
15 | 1 file changed, 8 insertions(+), 4 deletions(-) | ||
16 | |||
17 | diff --git a/meson.build b/meson.build | ||
18 | index 3f35173..11d7fa7 100644 | ||
19 | --- a/meson.build | ||
20 | +++ b/meson.build | ||
21 | @@ -96,8 +98,10 @@ conf.set('HAVE_TIMEGM', cc.has_function('timegm')) | ||
22 | conf.set('HAVE_MLOCK', cc.has_function('mlock')) | ||
23 | conf.set_quoted('GPG_EXECUTABLE', gpg_path) | ||
24 | conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version()) | ||
25 | -conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path) | ||
26 | -conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path) | ||
27 | +if get_option('ssh_agent') | ||
28 | + conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path) | ||
29 | + conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path) | ||
30 | +endif | ||
31 | conf.set10('WITH_SYSTEMD', with_systemd) | ||
32 | config_file = configure_file( | ||
33 | output: 'config.h', | ||
34 | -- | ||
35 | 2.34.1 | ||
36 | |||