Message ID | 20171103213142.11928-2-sojkam1@fel.cvut.cz |
---|---|
State | Accepted |
Headers | show |
Series | [LEDE-DEV] procd: Always tell cmake whether to include seccomp support or not | expand |
diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index f424cea57d..3d413266e4 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
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 <sojkam1@fel.cvut.cz> --- package/system/procd/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)