File: patch-meson.build.patch

package info (click to toggle)
fretboard 9.1-2
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 2,648 kB
  • sloc: makefile: 25; xml: 18
file content (38 lines) | stat: -rw-r--r-- 1,072 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
From: =?utf-8?q?Jeremy_B=C3=ADcha?= <jeremy.bicha@canonical.com>
Date: Sat, 26 Apr 2025 15:47:12 -0400
Subject: Patch meson.build

Update paths for Debian

Forwarded: not-needed
---
 meson_options.txt | 4 ++++
 src/meson.build   | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meson_options.txt b/meson_options.txt
index 864835d..362552a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -17,3 +17,7 @@ option(
                'the build so they are assumed to be in meson.project_source_root()/cargo'
 )
 
+option(
+  'host_arch',
+  type: 'string',
+)
diff --git a/src/meson.build b/src/meson.build
index 2001ee8..06f3d4f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -45,8 +45,7 @@ cargo_build = custom_target(
   install: true,
   install_dir: get_option('bindir'),
   command: [
-    'env', cargo_env,
     cargo_bin, 'build',
-    cargo_opt, '&&', 'cp', 'src' / rust_target / meson.project_name(), '@OUTPUT@',
+    cargo_opt, '&&', 'cp', 'src' / get_option('host_arch') / 'release' / meson.project_name(), '@OUTPUT@',
   ]
 )