From: Michal Sojka Date: Fri, 3 Nov 2017 21:31:42 +0000 (+0100) Subject: procd: Always tell cmake whether to include seccomp support or not X-Git-Tag: v17.01.5~153 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5872c19c63b61ad481f54eb7c415e52e22b15b91;p=oweals%2Fopenwrt.git procd: Always tell cmake whether to include seccomp support or not Without this change, when a user disables seccomp support in .config, procd does not get recompiled unless the package is cleaned manually. It is because when -D option is missing from cmake command line, cmake uses cached value from the previous run where seccomp was enabled. Signed-off-by: Michal Sojka (cherry picked from commit 0e300a3a71264d8938b17f9fb0d5f1ab33a0434a) --- diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index a2fea4dc12..93164ea69b 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -107,9 +107,8 @@ ifdef CONFIG_PACKAGE_procd-ujail CMAKE_OPTIONS += -DJAIL_SUPPORT=1 endif -ifdef CONFIG_PACKAGE_procd-seccomp - CMAKE_OPTIONS += -DSECCOMP_SUPPORT=1 -DUTRACE_SUPPORT=1 -endif +SECCOMP=$(if $(CONFIG_PACKAGE_procd-seccomp),1,0) +CMAKE_OPTIONS += -DSECCOMP_SUPPORT=$(SECCOMP) -DUTRACE_SUPPORT=$(SECCOMP) define Package/procd/install $(INSTALL_DIR) $(1)/sbin $(1)/etc $(1)/lib/functions