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
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
From fa401fc5082dbf4dc048e05222c752a14b808a53 Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Sat, 10 Aug 2024 15:14:15 -0400
Subject: [PATCH] fix meson
---
src/meson.build | 47 -----------------------------------------------
1 file changed, 47 deletions(-)
diff --git a/src/meson.build b/src/meson.build
index f64920f..11c45a7 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -25,50 +25,3 @@ gnome.compile_resources('overskride',
install: true,
install_dir: pkgdatadir,
)
-
-conf = configuration_data()
-conf.set_quoted('VERSION', meson.project_version())
-conf.set_quoted('GETTEXT_PACKAGE', 'overskride')
-conf.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
-conf.set_quoted('PKGDATADIR', pkgdatadir)
-
-configure_file(
- input: 'config.rs.in',
- output: 'config.rs',
- configuration: conf
-)
-
-# Copy the config.rs output to the source directory.
-run_command(
- 'cp',
- join_paths(meson.project_build_root(), 'src', 'config.rs'),
- join_paths(meson.project_source_root(), 'src', 'config.rs'),
- check: true
-)
-
-cargo_bin = find_program('cargo')
-cargo_opt = [ '--manifest-path', meson.project_source_root() / 'Cargo.toml' ]
-cargo_opt += [ '--target-dir', meson.project_build_root() / 'src' ]
-cargo_env = [ 'CARGO_HOME=' + meson.project_build_root() / 'cargo-home' ]
-
-if get_option('buildtype') == 'release'
- cargo_opt += [ '--release' ]
- rust_target = 'release'
-else
- rust_target = 'debug'
-endif
-
-cargo_build = custom_target(
- 'cargo-build',
- build_by_default: true,
- build_always_stale: true,
- output: meson.project_name(),
- console: true,
- install: true,
- install_dir: get_option('bindir'),
- command: [
- 'env', cargo_env,
- cargo_bin, 'build',
- cargo_opt, '&&', 'cp', 'src' / rust_target / meson.project_name(), '@OUTPUT@',
- ]
-)
--
2.45.2
|
