From: marcandre.lureau@redhat.com
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, berrange@redhat.com, armbru@redhat.com,
stefanha@redhat.com,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [RFC v3 10/32] build-sys: add --with-rust{-target} & basic build infrastructure
Date: Tue, 7 Sep 2021 16:19:21 +0400 [thread overview]
Message-ID: <20210907121943.3498701-11-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20210907121943.3498701-1-marcandre.lureau@redhat.com>
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Add the build-sys infrastructure to optionally build Rust code.
Introduce a top-level workspace, so various sub-projects (libraries,
executables etc) can be developed together, sharing the dependencies and
output directory.
If not Tier 1 (aarch64 and x86), all of the host architecture QEMU
supports should be Tier 2:
https://doc.rust-lang.org/nightly/rustc/platform-support.html
Rust is generally available on various distributions (thanks to Firefox,
I suppose). If not, it can usually be installed with rustup.
configure will enable Rust support automatically if cargo is present.
Rust support can be disabled --without-rust. When detecting windows
cross building, it will use the $cpu-pc-windows-gnu target by
default (more default mappings could be added over time). This can be
changed with --with-rust-target=RTT.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
configure | 11 +++++++++++
meson.build | 27 +++++++++++++++++++++++++++
.gitignore | 1 +
Cargo.toml | 2 ++
meson_options.txt | 5 +++++
5 files changed, 46 insertions(+)
create mode 100644 Cargo.toml
diff --git a/configure b/configure
index 48ff2837d9..470b90543f 100755
--- a/configure
+++ b/configure
@@ -445,6 +445,8 @@ fuse="auto"
fuse_lseek="auto"
multiprocess="auto"
slirp_smbd="$default_feature"
+with_rust="auto"
+with_rust_target=""
malloc_trim="auto"
gio="$default_feature"
@@ -1586,6 +1588,12 @@ for opt do
;;
--disable-slirp-smbd) slirp_smbd=no
;;
+ --with-rust) with_rust=enabled
+ ;;
+ --without-rust) with_rust=disabled
+ ;;
+ --with-rust-target=*) with_rust_target="$optarg"
+ ;;
*)
echo "ERROR: unknown option $opt"
echo "Try '$0 --help' for more information"
@@ -1773,6 +1781,8 @@ Advanced options (experts only):
--extra-ldflags=LDFLAGS append extra linker flags LDFLAGS
--cross-cc-ARCH=CC use compiler when building ARCH guest test cases
--cross-cc-flags-ARCH= use compiler flags when building ARCH guest tests
+ --with-rust enable Rust compilation
+ --with-rust-target=RTT use the given Rust target triple
--make=MAKE use specified make [$make]
--python=PYTHON use specified python [$python]
--sphinx-build=SPHINX use specified sphinx-build [$sphinx_build]
@@ -5199,6 +5209,7 @@ if test "$skip_meson" = no; then
-Db_coverage=$(if test "$gcov" = yes; then echo true; else echo false; fi) \
-Db_lto=$lto -Dcfi=$cfi -Dcfi_debug=$cfi_debug \
-Dmalloc=$malloc -Dmalloc_trim=$malloc_trim -Dsparse=$sparse \
+ -Dwith_rust=$with_rust -Dwith_rust_target=$with_rust_target \
-Dkvm=$kvm -Dhax=$hax -Dwhpx=$whpx -Dhvf=$hvf -Dnvmm=$nvmm \
-Dxen=$xen -Dxen_pci_passthrough=$xen_pci_passthrough -Dtcg=$tcg \
-Dcocoa=$cocoa -Dgtk=$gtk -Dmpath=$mpath -Dsdl=$sdl -Dsdl_image=$sdl_image \
diff --git a/meson.build b/meson.build
index cbf3ce19ae..63b61a2bc8 100644
--- a/meson.build
+++ b/meson.build
@@ -108,6 +108,29 @@ endif
bzip2 = find_program('bzip2', required: install_edk2_blobs)
+cargo = find_program('cargo', required: get_option('with_rust'))
+with_rust = cargo.found()
+
+if with_rust
+ rust_target_triple = get_option('with_rust_target')
+ if meson.is_cross_build()
+ # more default target mappings may be added over time
+ if rust_target_triple == '' and targetos == 'windows'
+ rust_target_triple = host_machine.cpu() + '-pc-windows-gnu'
+ endif
+ if rust_target_triple == ''
+ error('cross-compiling, but no Rust target-triple defined.')
+ endif
+ endif
+endif
+config_host_data.set('CONFIG_WITH_RUST', with_rust)
+
+if get_option('optimization') in ['0', '1', 'g']
+ rs_build_type = 'debug'
+else
+ rs_build_type = 'release'
+endif
+
##################
# Compiler flags #
##################
@@ -2916,6 +2939,10 @@ if targetos == 'windows'
summary_info += {'Windows SDK': config_host['WIN_SDK']}
endif
endif
+summary_info += {'Rust support': with_rust}
+if with_rust and rust_target_triple != ''
+ summary_info += {'Rust target': rust_target_triple}
+endif
summary_info += {'CFLAGS': ' '.join(get_option('c_args')
+ ['-O' + get_option('optimization')]
+ (get_option('debug') ? ['-g'] : []))}
diff --git a/.gitignore b/.gitignore
index eb2553026c..78715bc7c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
/GNUmakefile
/build/
+/target/
*.pyc
.sdk
.stgit-*
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000000..c4b464ff15
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,2 @@
+[workspace]
+members = []
diff --git a/meson_options.txt b/meson_options.txt
index a9a9b8f4c6..fe9f90634b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -155,3 +155,8 @@ option('slirp', type: 'combo', value: 'auto',
option('fdt', type: 'combo', value: 'auto',
choices: ['disabled', 'enabled', 'auto', 'system', 'internal'],
description: 'Whether and how to find the libfdt library')
+
+option('with_rust', type: 'feature', value: 'auto',
+ description: 'Enable Rust support')
+option('with_rust_target', type : 'string', value: '',
+ description: 'Rust target triple')
--
2.33.0.113.g6c40894d24
next prev parent reply other threads:[~2021-09-07 12:40 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-07 12:19 [RFC v3 00/32] Rust binding for QAPI and qemu-ga QMP handler examples marcandre.lureau
2021-09-07 12:19 ` [RFC v3 01/32] RFC: docs: add supported host CPUs section marcandre.lureau
2021-09-07 12:33 ` Peter Maydell
2021-09-13 11:32 ` Marc-André Lureau
2021-09-13 11:46 ` Peter Maydell
2021-09-07 12:19 ` [RFC v3 02/32] build-sys: add HAVE_IPPROTO_MPTCP marcandre.lureau
2021-09-08 12:01 ` Markus Armbruster
2021-09-13 13:02 ` Paolo Bonzini
2021-09-07 12:19 ` [RFC v3 03/32] scripts/qapi: teach c_param_type() to return const argument type marcandre.lureau
2021-09-08 12:10 ` Markus Armbruster
2021-09-08 14:33 ` Marc-André Lureau
2021-09-07 12:19 ` [RFC v3 04/32] glib-compat: add G_SIZEOF_MEMBER marcandre.lureau
2021-09-08 12:16 ` Markus Armbruster
2021-09-08 13:49 ` Marc-André Lureau
2021-09-07 12:19 ` [RFC v3 05/32] scripts/qapi: add QAPISchemaVisitor.visit_module_end marcandre.lureau
2021-09-08 12:26 ` Markus Armbruster
2021-09-07 12:19 ` [RFC v3 06/32] scripts/qapi: add a CABI module marcandre.lureau
2021-09-07 12:19 ` [RFC v3 07/32] scripts/qapi: generate CABI dump for C types marcandre.lureau
2021-09-07 12:19 ` [RFC v3 08/32] tests: build qapi-cabi (C ABI dump) marcandre.lureau
2021-09-07 12:19 ` [RFC v3 09/32] build-sys: add i686 cpu target marcandre.lureau
2021-09-08 13:45 ` Peter Maydell
2021-09-07 12:19 ` marcandre.lureau [this message]
2021-09-08 14:00 ` [RFC v3 10/32] build-sys: add --with-rust{-target} & basic build infrastructure Peter Maydell
2021-09-08 14:21 ` Marc-André Lureau
2021-09-07 12:19 ` [RFC v3 11/32] build-sys: add a cargo-wrapper script marcandre.lureau
2021-09-07 12:19 ` [RFC v3 12/32] rust: provide a common crate for QEMU marcandre.lureau
2021-09-10 1:18 ` Alistair Francis
2021-09-10 7:43 ` Marc-André Lureau
2021-09-13 17:11 ` Paolo Bonzini
2021-09-14 11:34 ` Marc-André Lureau
2021-09-07 12:19 ` [RFC v3 13/32] rust: use vendored-sources marcandre.lureau
2021-09-08 15:38 ` Ian Jackson
2021-09-08 15:47 ` Marc-André Lureau
2021-09-08 15:55 ` Ian Jackson
2021-09-08 16:15 ` Marc-André Lureau
2021-09-08 16:22 ` Peter Maydell
2021-09-08 16:22 ` Ian Jackson
2021-09-08 16:20 ` Marc-André Lureau
2021-09-08 16:29 ` Ian Jackson
2021-09-08 16:34 ` Marc-André Lureau
2021-09-08 16:50 ` Ian Jackson
2021-09-08 19:33 ` Marc-André Lureau
2021-09-09 16:02 ` Peter Maydell
2021-09-09 16:29 ` Marc-André Lureau
2021-09-09 16:53 ` Daniel P. Berrangé
2021-09-09 17:04 ` Ian Jackson
2021-09-13 14:21 ` Paolo Bonzini
2021-09-09 16:49 ` Daniel P. Berrangé
2021-09-09 17:02 ` Ian Jackson
2021-09-07 12:19 ` [RFC v3 14/32] scripts/qapi: add QAPISchemaIfCond.rsgen() marcandre.lureau
2021-09-08 12:33 ` Markus Armbruster
2021-09-08 14:06 ` Marc-André Lureau
2021-09-07 12:19 ` [RFC v3 15/32] scripts/qapi: strip trailing whitespaces marcandre.lureau
2021-09-07 12:19 ` [RFC v3 16/32] scripts/qapi: add Rust FFI bindings generation marcandre.lureau
2021-09-07 12:19 ` [RFC v3 17/32] scripts/qapi: learn to generate ABI dump for Rust FFI marcandre.lureau
2021-09-07 12:19 ` [RFC v3 18/32] tests: generate Rust bindings marcandre.lureau
2021-09-07 12:19 ` [RFC v3 19/32] tests: check Rust and C CABI diffs marcandre.lureau
2021-09-07 12:19 ` [RFC v3 20/32] scripts/qapi: generate high-level Rust bindings marcandre.lureau
2021-09-07 12:19 ` [RFC v3 21/32] tests/rust: build a common library, checking bindings compile marcandre.lureau
2021-09-07 12:19 ` [RFC v3 22/32] qga: build qapi-cabi binary (ABI from C) marcandre.lureau
2021-09-07 12:19 ` [RFC v3 23/32] qga/rust: build and link an empty static library marcandre.lureau
2021-09-07 12:19 ` [RFC v3 24/32] qga/rust: generate QGA QAPI types FFI bindings marcandre.lureau
2021-09-07 12:19 ` [RFC v3 25/32] qga/rust: build a qga-cabi-rs executable (ABI from Rust) marcandre.lureau
2021-09-07 12:19 ` [RFC v3 26/32] qga/rust: check the Rust C binding marcandre.lureau
2021-09-07 12:19 ` [RFC v3 27/32] qga/rust: build high-level Rust QAPI types marcandre.lureau
2021-09-07 12:19 ` [RFC v3 28/32] qga/rust: implement get-host-name in Rust (example) marcandre.lureau
2021-09-07 12:19 ` [RFC v3 29/32] qga/rust: implement {get,set}-vcpus " marcandre.lureau
2021-09-07 12:19 ` [RFC v3 30/32] tests/vm: add Rust to FreeBSD VM marcandre.lureau
2021-09-07 12:19 ` [RFC v3 31/32] tests/vm: bump fedora VM to f32 marcandre.lureau
2021-09-07 12:19 ` [RFC v3 32/32] tests/vm: add Rust to Fedora marcandre.lureau
2021-09-08 13:22 ` [RFC v3 00/32] Rust binding for QAPI and qemu-ga QMP handler examples Markus Armbruster
2021-09-08 13:55 ` Marc-André Lureau
2021-09-09 10:31 ` Markus Armbruster
2021-09-09 15:22 ` Marc-André Lureau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210907121943.3498701-11-marcandre.lureau@redhat.com \
--to=marcandre.lureau@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).