Merge pull request #5783 from DrDaveD/without-seccomp-flag

Add mconfig --without-seccomp option

Author: dtrudg

mconfig

@@ -57,6 +57,7 @@ fi
 
 with_network=1
 with_suid=1
+with_seccomp_check=1
 
 prefix=
 exec_prefix=
@@ -111,6 +112,7 @@ usage_args () {
 	echo "  Singularity options:"
 	echo "     --without-suid    do not install SUID binary (linux only)"
 	echo "     --without-network do not compile/install network plugins (linux only)"
+	echo "     --without-seccomp do not compile/install seccomp support even if available"
 	echo
 	echo "  Path modification options:"
 	echo "     --prefix         install project in \`prefix'"
@@ -361,6 +363,8 @@ while [ $# -ne 0 ]; do
    with_suid=0; shift;;
   --without-network)
    with_network=0; shift;;
+  --without-seccomp)
+   with_seccomp_check=0; shift;;
   -V)
    if ! echo "$2" | awk '/^-.*/ || /^$/ { exit 2 }'; then
      echo "error: option requires an argument: $1"

mlocal/checks/project-post.chk

@@ -303,15 +303,17 @@ fi
 ########################
 # libseccomp dev
 ########################
-printf " checking: libseccomp+headers... "
-seccomp_iflags=`pkg-config --cflags-only-I libseccomp 2>/dev/null || true`
-if ! printf "#include <seccomp.h>\nint main() { seccomp_syscall_resolve_name(\"read\"); }" | \
-   $tgtcc $user_cflags $ldflags $seccomp_iflags -x c -o /dev/null - -lseccomp >/dev/null 2>&1; then
-    tgtstatic=0
-    echo "no"
-else
-    echo "yes"
-    appsec=1
+if [ "$with_seccomp_check" = "1" ];then
+    printf " checking: libseccomp+headers... "
+    seccomp_iflags=`pkg-config --cflags-only-I libseccomp 2>/dev/null || true`
+    if ! printf "#include <seccomp.h>\nint main() { seccomp_syscall_resolve_name(\"read\"); }" | \
+       $tgtcc $user_cflags $ldflags $seccomp_iflags -x c -o /dev/null - -lseccomp >/dev/null 2>&1; then
+	tgtstatic=0
+	echo "no"
+    else
+	echo "yes"
+	appsec=1
+    fi
 fi
 
 ########################