EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Michal Sojka 2017-11-03 22:31:42 +01:00 committed by John Crispin
parent 727ab294d0
commit 0e300a3a71
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/system/procd/Makefile
View File

@ -87,9 +87,8 @@ ifdef CONFIG_PACKAGE_procd-ujail
CMAKE_OPTIONS += -DJAIL_SUPPORT=1 CMAKE_OPTIONS += -DJAIL_SUPPORT=1
endif endif
ifdef CONFIG_PACKAGE_procd-seccomp SECCOMP=$(if $(CONFIG_PACKAGE_procd-seccomp),1,0)
CMAKE_OPTIONS += -DSECCOMP_SUPPORT=1 -DUTRACE_SUPPORT=1 CMAKE_OPTIONS += -DSECCOMP_SUPPORT=$(SECCOMP) -DUTRACE_SUPPORT=$(SECCOMP)
endif
define Package/procd/install define Package/procd/install
$(INSTALL_DIR) $(1)/sbin $(1)/etc $(1)/lib/functions $(INSTALL_DIR) $(1)/sbin $(1)/etc $(1)/lib/functions