[source] procd: Always tell cmake whether to include seccomp support or not

LEDE Commits lede-commits at lists.infradead.org
Thu Dec 14 09:45:27 PST 2017


jow pushed a commit to source.git, branch lede-17.01:
https://git.lede-project.org/5872c19c63b61ad481f54eb7c415e52e22b15b91

commit 5872c19c63b61ad481f54eb7c415e52e22b15b91
Author: Michal Sojka <sojkam1 at fel.cvut.cz>
AuthorDate: Fri Nov 3 22:31:42 2017 +0100

    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 <sojkam1 at fel.cvut.cz>
    (cherry picked from commit 0e300a3a71264d8938b17f9fb0d5f1ab33a0434a)
---
 package/system/procd/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index a2fea4d..93164ea 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



More information about the lede-commits mailing list