From eceb90dc76f8e1a49e92076fd032dc98622a4535 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Sat, 26 Feb 2022 18:14:44 +0200 Subject: [PATCH] package/bubblewrap: switch to the meson build system Version 0.6.0 introduced a Meson build system, and upstream seems to have the intention to abandon the previous autotools based one. Switch to Meson for future proofing. Signed-off-by: Adrian Perez de Castro Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bubblewrap/bubblewrap.mk | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 1ca2029700..5875b0d6e2 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -14,22 +14,24 @@ BUBBLEWRAP_LICENSE_FILES = COPYING BUBBLEWRAP_CPE_ID_VENDOR = projectatomic BUBBLEWRAP_CONF_OPTS = \ - --enable-require-userns=no \ - --disable-man \ - --disable-sudo \ - --with-priv-mode=none + -Dzsh_completion=disabled \ + -Dman=disabled \ + -Dpython=$(HOST_DIR)/bin/python \ + -Drequire_userns=false ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) -BUBBLEWRAP_CONF_OPTS += --with-bash-completion-dir=/usr/share/bash-completion/completions +BUBBLEWRAP_CONF_OPTS += \ + -Dbash_completion=enabled \ + -Dbash_completion_dir=/usr/share/bash-completion/completions else -BUBBLEWRAP_CONF_OPTS += --without-bash-completion-dir +BUBBLEWRAP_CONF_OPTS += -Dbash_completion=disabled endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -BUBBLEWRAP_CONF_OPTS += --enable-selinux +BUBBLEWRAP_CONF_OPTS += -Dselinux=enabled BUBBLEWRAP_DEPENDENCIES += libselinux else -BUBBLEWRAP_CONF_OPTS += --disable-selinux +BUBBLEWRAP_CONF_OPTS += -Dselinux=disabled endif # We need to mark bwrap as setuid, in case the kernel @@ -38,4 +40,4 @@ define BUBBLEWRAP_PERMISSIONS /usr/bin/bwrap f 1755 0 0 - - - - - endef -$(eval $(autotools-package)) +$(eval $(meson-package))