From deecd170697a137558d7b3f6dc8c8d52527f11d4 Mon Sep 17 00:00:00 2001 From: Mark Dain Date: Mon, 23 Nov 2020 20:21:21 +0000 Subject: [PATCH 1/2] DOCS: Made dependence on g++-multilib more explicit By default this library is needed as the option overlay-xcompile defaults to ON. Therefore we should list g++-multilib as a dependency directly and only mention how to get rid of this dependency, not the other way around. This will probably avoid some confusion on the reader's side. --- docs/dev/build-instructions/build_linux.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/dev/build-instructions/build_linux.md b/docs/dev/build-instructions/build_linux.md index e3e260131..b123101d0 100644 --- a/docs/dev/build-instructions/build_linux.md +++ b/docs/dev/build-instructions/build_linux.md @@ -27,13 +27,14 @@ sudo apt install \ libsndfile1-dev \ libspeechd-dev \ libavahi-compat-libdnssd-dev \ - libzeroc-ice-dev + libzeroc-ice-dev \ + g++-multilib ``` If you intend to include grpc-support for the Mumbe server (murmur), you also have to install the following packages: `libgrpc++-dev` and `protobuf-compiler-grpc` -If you are on a 64bit system and want to cross-compile overlay-support for 32bit applications as well (which is enabled by default), you'll also have -to install `g++-multilib`. If you don't want to do this, use `-Doverlay-xcompile=OFF` when invoking cmake. +The dependence on `g++-multilib` only applies if you are on a 64bit system and want to cross-compile overlay support for 32bit applications as well +(which is enabled by default). If you don't do this (`-Doverlay-xcompile=OFF` when invoking cmake), you also don't have to install `g++-multilib`. If you are using a distribution that is not based on Ubuntu, you probably have to change the command accordingly. From 9ce724656bc2637f7bf527c5bc2ec1a094258abf Mon Sep 17 00:00:00 2001 From: Robert Adam Date: Tue, 24 Nov 2020 10:00:02 +0100 Subject: [PATCH 2/2] DOCS: Fix typo in build_linux.md --- docs/dev/build-instructions/build_linux.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/dev/build-instructions/build_linux.md b/docs/dev/build-instructions/build_linux.md index b123101d0..8345d1a89 100644 --- a/docs/dev/build-instructions/build_linux.md +++ b/docs/dev/build-instructions/build_linux.md @@ -31,7 +31,8 @@ sudo apt install \ g++-multilib ``` -If you intend to include grpc-support for the Mumbe server (murmur), you also have to install the following packages: `libgrpc++-dev` and `protobuf-compiler-grpc` +If you intend to include grpc-support for the Mumble server (murmur), you also have to install the following packages: `libgrpc++-dev` and +`protobuf-compiler-grpc` The dependence on `g++-multilib` only applies if you are on a 64bit system and want to cross-compile overlay support for 32bit applications as well (which is enabled by default). If you don't do this (`-Doverlay-xcompile=OFF` when invoking cmake), you also don't have to install `g++-multilib`.