mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-23 13:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

package/bubblewrap: switch to the meson build system

Browse Source 
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 <aperez@igalia.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Adrian Perez de Castro 2022-02-26 18:14:44 +02:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent d589604b46
commit eceb90dc76
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
package/bubblewrap/bubblewrap.mk
View File

@ -14,22 +14,24 @@ BUBBLEWRAP_LICENSE_FILES = COPYING
BUBBLEWRAP_CPE_ID_VENDOR = projectatomic BUBBLEWRAP_CPE_ID_VENDOR = projectatomic
BUBBLEWRAP_CONF_OPTS = \ BUBBLEWRAP_CONF_OPTS = \
--enable-require-userns=no \ -Dzsh_completion=disabled \
--disable-man \ -Dman=disabled \
--disable-sudo \ -Dpython=$(HOST_DIR)/bin/python \
--with-priv-mode=none -Drequire_userns=false
ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) 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 else
BUBBLEWRAP_CONF_OPTS += --without-bash-completion-dir BUBBLEWRAP_CONF_OPTS += -Dbash_completion=disabled
endif endif
ifeq ($(BR2_PACKAGE_LIBSELINUX),y) ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
BUBBLEWRAP_CONF_OPTS += --enable-selinux BUBBLEWRAP_CONF_OPTS += -Dselinux=enabled
BUBBLEWRAP_DEPENDENCIES += libselinux BUBBLEWRAP_DEPENDENCIES += libselinux
else else
BUBBLEWRAP_CONF_OPTS += --disable-selinux BUBBLEWRAP_CONF_OPTS += -Dselinux=disabled
endif endif
# We need to mark bwrap as setuid, in case the kernel # 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 - - - - - /usr/bin/bwrap f 1755 0 0 - - - - -
endef endef
$(eval $(autotools-package)) $(eval $(meson-package))