From 74900c667736d5333350e11ba644bb331c65e070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Wed, 23 Jun 2021 15:45:24 -0300 Subject: [PATCH] file: add build option for seccomp. file(1) is known to fail in arbitrary ways when seccomp is enabled, and it's used as a build tool by us. To minimize the potential impact, make it an off by default build option. The build option also allows us to re-organize the template logic, since --disable-seccomp will now be in configure_args by default. --- srcpkgs/file/template | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/srcpkgs/file/template b/srcpkgs/file/template index 0154e0bc138d..a3213b20ecc4 100644 --- a/srcpkgs/file/template +++ b/srcpkgs/file/template @@ -1,11 +1,11 @@ # Template file for 'file' pkgname=file version=5.40 -revision=2 +revision=3 bootstrap=yes build_style=gnu-configure -configure_args="--enable-static" -makedepends="zlib-devel" +configure_args="--enable-static $(vopt_enable libseccomp)" +makedepends="zlib-devel $(vopt_if libseccomp libseccomp-devel)" short_desc="File type identification utility" maintainer="Enno Boland " license="BSD-2-Clause" @@ -13,12 +13,16 @@ homepage="http://www.darwinsys.com/file/" distfiles="https://astron.com/pub/file/file-${version}.tar.gz" checksum=167321f43c148a553f68a0ea7f579821ef3b11c27b8cbe158e4df897e4a5dd57 +build_options="libseccomp" + if [ -z "$CHROOT_READY" ]; then - # libseccomp's default=auto - # and libseccomp is not bootstrap - # If we're bootstrap from host with libseccomp installed + # libseccomp's default=auto and + # libseccomp is not bootstrap + # If we're bootstraping from host with libseccomp installed, # bootstrap will fail to install shlib required by file. - configure_args+=" --disable-libseccomp" + if [ "$build_option_libseccomp" ]; then + msg_error "libseccomp can't be enabled when bootstrapping\n" + fi fi if [ "$CROSS_BUILD" ]; then @@ -26,7 +30,6 @@ if [ "$CROSS_BUILD" ]; then hostmakedepends="file" fi - post_install() { vlicense COPYING }