From 25fb9ae3ec2d1350cd4f3657196608bf931d7b9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20Baz=20Castillo?= Date: Sat, 5 Nov 2022 21:28:30 +0100 Subject: [PATCH 1/3] Meson: Pin ninja version to 1.10.2.4 - Avoid segfault in Linux using `ninja` latest version 1.11.1. - Thanks Vittorio Palmisano @vpalmisano. More info: - https://mediasoup.discourse.group/t/partly-solved-could-not-detect-ninja-v1-8-2-or-newer - https://github.com/ninja-build/ninja/issues/2211 --- CHANGELOG.md | 5 +++++ worker/Makefile | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8c79f4ecf..a0fd505959 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog +### NEXT + +* Meson: Pin `ninja` version to 1.10.2.4 to avoid segfault in Linux using `ninja` latest version 1.11.1 (PR #). + + ### 3.11.1 * `ActiveSpeakerObserver`: Revert 'dominantspeaker' event changes in PR #941 to avoid breaking changes (PR #947). diff --git a/worker/Makefile b/worker/Makefile index 726128886d..4b226705e7 100644 --- a/worker/Makefile +++ b/worker/Makefile @@ -32,6 +32,10 @@ MESON_ARGS ?= "" # Workaround for NixOS and Guix that don't work with pre-built binaries, see: # https://github.com/NixOS/nixpkgs/issues/142383. PIP_BUILD_BINARIES = $(shell [ -f /etc/NIXOS -o -d /etc/guix ] && echo "--no-binary :all:") +# Let's use a specific version of ninja to avoid issues like this one: +# https://mediasoup.discourse.group/t/partly-solved-could-not-detect-ninja-v1-8-2-or-newer/ +# https://mediasoup.discourse.group/t/partly-solved-could-not-detect-ninja-v1-8-2-or-newer/ +NINJA_VERSION ?= 1.10.2.4 # Disable `*.pyc` files creation. export PYTHONDONTWRITEBYTECODE = 1 @@ -95,7 +99,7 @@ ifeq ($(wildcard $(PIP_DIR)),) echo "Installation failed, likely because PIP is unavailable, if you are on Debian/Ubuntu or derivative please install the python3-pip package" # Install `meson` and `ninja` using `pip` into custom location, so we don't # depend on system-wide installation. - $(PYTHON) -m pip install --upgrade --target=$(PIP_DIR) $(PIP_BUILD_BINARIES) meson==$(MESON_VERSION) ninja + $(PYTHON) -m pip install --upgrade --target=$(PIP_DIR) $(PIP_BUILD_BINARIES) meson==$(MESON_VERSION) ninja==$(NINJA_VERSION) endif setup: meson-ninja From efc6d7aa9733e76bfa19edad82497e7fa661e715 Mon Sep 17 00:00:00 2001 From: Nazar Mokrynskyi Date: Sat, 5 Nov 2022 22:32:10 +0200 Subject: [PATCH 2/3] Remove duplicated line --- worker/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/worker/Makefile b/worker/Makefile index 4b226705e7..aa35ad0c77 100644 --- a/worker/Makefile +++ b/worker/Makefile @@ -34,7 +34,6 @@ MESON_ARGS ?= "" PIP_BUILD_BINARIES = $(shell [ -f /etc/NIXOS -o -d /etc/guix ] && echo "--no-binary :all:") # Let's use a specific version of ninja to avoid issues like this one: # https://mediasoup.discourse.group/t/partly-solved-could-not-detect-ninja-v1-8-2-or-newer/ -# https://mediasoup.discourse.group/t/partly-solved-could-not-detect-ninja-v1-8-2-or-newer/ NINJA_VERSION ?= 1.10.2.4 # Disable `*.pyc` files creation. From c22f8d3b0bb38030f0d58635da9febcc550584da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20Baz=20Castillo?= Date: Sat, 5 Nov 2022 21:37:04 +0100 Subject: [PATCH 3/3] fix conflict --- worker/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/worker/Makefile b/worker/Makefile index aa35ad0c77..5e0030fc21 100644 --- a/worker/Makefile +++ b/worker/Makefile @@ -32,8 +32,10 @@ MESON_ARGS ?= "" # Workaround for NixOS and Guix that don't work with pre-built binaries, see: # https://github.com/NixOS/nixpkgs/issues/142383. PIP_BUILD_BINARIES = $(shell [ -f /etc/NIXOS -o -d /etc/guix ] && echo "--no-binary :all:") -# Let's use a specific version of ninja to avoid issues like this one: +# Let's use a specific version of ninja to avoid version 1.11.1 due to a bug in +# Meson: # https://mediasoup.discourse.group/t/partly-solved-could-not-detect-ninja-v1-8-2-or-newer/ +# https://github.com/ninja-build/ninja/issues/2211 NINJA_VERSION ?= 1.10.2.4 # Disable `*.pyc` files creation.