File autogenned.patch of Package lxc.openSUSE_13.1_Update
It contains the effect of these patches:
configure-find-seccomp-using-pkg-config.patch
configure-support-suse-s-docbook-to-man.patch
diff --git a/configure b/configure
index dfb8e42..ee5faae 100755
--- a/configure
+++ b/configure
@@ -659,9 +659,6 @@ ENABLE_LUA_FALSE
ENABLE_LUA_TRUE
PYTHONDEV_LIBS
PYTHONDEV_CFLAGS
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
-PKG_CONFIG
pkgpyexecdir
pyexecdir
pkgpythondir
@@ -676,6 +673,10 @@ ENABLE_PYTHON_TRUE
ENABLE_EXAMPLES_FALSE
ENABLE_EXAMPLES_TRUE
SECCOMP_LIBS
+SECCOMP_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
ENABLE_SECCOMP_FALSE
ENABLE_SECCOMP_TRUE
APPARMOR_LIBS
@@ -806,10 +807,12 @@ LDFLAGS
LIBS
CPPFLAGS
CPP
-PYTHON
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
+SECCOMP_CFLAGS
+SECCOMP_LIBS
+PYTHON
PYTHONDEV_CFLAGS
PYTHONDEV_LIBS
LUA_CFLAGS
@@ -1468,12 +1471,16 @@ Some influential environment variables:
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
- PYTHON the Python interpreter
PKG_CONFIG path to pkg-config utility
PKG_CONFIG_PATH
directories to add to pkg-config's search path
PKG_CONFIG_LIBDIR
path overriding pkg-config's built-in search path
+ SECCOMP_CFLAGS
+ C compiler flags for SECCOMP, overriding pkg-config
+ SECCOMP_LIBS
+ linker flags for SECCOMP, overriding pkg-config
+ PYTHON the Python interpreter
PYTHONDEV_CFLAGS
C compiler flags for PYTHONDEV, overriding pkg-config
PYTHONDEV_LIBS
@@ -4821,7 +4828,7 @@ if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for docbook2x-man" >&5
$as_echo_n "checking for docbook2x-man... " >&6; }
- for name in docbook2x-man db2x_docbook2man; do
+ for name in docbook2x-man db2x_docbook2man docbook-to-man; do
if "$name" --help >/dev/null 2>&1; then
db2xman="$name"
break;
@@ -5034,113 +5041,6 @@ else
fi
-if test -z "$ENABLE_SECCOMP_TRUE"; then :
- ac_fn_c_check_header_mongrel "$LINENO" "seccomp.h" "ac_cv_header_seccomp_h" "$ac_includes_default"
-if test "x$ac_cv_header_seccomp_h" = xyes; then :
-
-else
- as_fn_error $? "You must install the seccomp development package in order to compile lxc" "$LINENO" 5
-fi
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for seccomp_init in -lseccomp" >&5
-$as_echo_n "checking for seccomp_init in -lseccomp... " >&6; }
-if ${ac_cv_lib_seccomp_seccomp_init+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lseccomp $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char seccomp_init ();
-int
-main ()
-{
-return seccomp_init ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_seccomp_seccomp_init=yes
-else
- ac_cv_lib_seccomp_seccomp_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_seccomp_seccomp_init" >&5
-$as_echo "$ac_cv_lib_seccomp_seccomp_init" >&6; }
-if test "x$ac_cv_lib_seccomp_seccomp_init" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSECCOMP 1
-_ACEOF
-
- LIBS="-lseccomp $LIBS"
-
-else
- as_fn_error $? "You must install the seccomp development package in order to compile lxc" "$LINENO" 5
-fi
-
- SECCOMP_LIBS=-lseccomp
-
-fi
-
-# HAVE_SCMP_FILTER_CTX=1 will tell us we have libseccomp api >= 1.0.0
-ac_fn_c_check_type "$LINENO" "scmp_filter_ctx" "ac_cv_type_scmp_filter_ctx" "#include <seccomp.h>
-"
-if test "x$ac_cv_type_scmp_filter_ctx" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SCMP_FILTER_CTX 1
-_ACEOF
-
-
-fi
-
-
-# Configuration examples
-# Check whether --enable-examples was given.
-if test "${enable_examples+set}" = set; then :
- enableval=$enable_examples;
-else
- enable_examples=yes
-fi
-
- if test "x$enable_examples" = "xyes"; then
- ENABLE_EXAMPLES_TRUE=
- ENABLE_EXAMPLES_FALSE='#'
-else
- ENABLE_EXAMPLES_TRUE='#'
- ENABLE_EXAMPLES_FALSE=
-fi
-
-
-# Python3 module and scripts
-# Check whether --enable-python was given.
-if test "${enable_python+set}" = set; then :
- enableval=$enable_python; enable_python=yes
-else
- enable_python=no
-fi
-
- if test "x$enable_python" = "xyes"; then
- ENABLE_PYTHON_TRUE=
- ENABLE_PYTHON_FALSE='#'
-else
- ENABLE_PYTHON_TRUE='#'
- ENABLE_PYTHON_FALSE=
-fi
-
-
@@ -5261,6 +5161,247 @@ $as_echo "no" >&6; }
PKG_CONFIG=""
fi
fi
+if test -z "$ENABLE_SECCOMP_TRUE"; then :
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SECCOMP" >&5
+$as_echo_n "checking for SECCOMP... " >&6; }
+
+if test -n "$SECCOMP_CFLAGS"; then
+ pkg_cv_SECCOMP_CFLAGS="$SECCOMP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libseccomp\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libseccomp") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SECCOMP_CFLAGS=`$PKG_CONFIG --cflags "libseccomp" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$SECCOMP_LIBS"; then
+ pkg_cv_SECCOMP_LIBS="$SECCOMP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libseccomp\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libseccomp") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SECCOMP_LIBS=`$PKG_CONFIG --libs "libseccomp" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ SECCOMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libseccomp" 2>&1`
+ else
+ SECCOMP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libseccomp" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SECCOMP_PKG_ERRORS" >&5
+
+
+ ac_fn_c_check_header_mongrel "$LINENO" "seccomp.h" "ac_cv_header_seccomp_h" "$ac_includes_default"
+if test "x$ac_cv_header_seccomp_h" = xyes; then :
+
+else
+ as_fn_error $? "You must install the seccomp development package in order to compile lxc" "$LINENO" 5
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for seccomp_init in -lseccomp" >&5
+$as_echo_n "checking for seccomp_init in -lseccomp... " >&6; }
+if ${ac_cv_lib_seccomp_seccomp_init+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lseccomp $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char seccomp_init ();
+int
+main ()
+{
+return seccomp_init ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_seccomp_seccomp_init=yes
+else
+ ac_cv_lib_seccomp_seccomp_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_seccomp_seccomp_init" >&5
+$as_echo "$ac_cv_lib_seccomp_seccomp_init" >&6; }
+if test "x$ac_cv_lib_seccomp_seccomp_init" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSECCOMP 1
+_ACEOF
+
+ LIBS="-lseccomp $LIBS"
+
+else
+ as_fn_error $? "You must install the seccomp development package in order to compile lxc" "$LINENO" 5
+fi
+
+ SECCOMP_LIBS=-lseccomp
+
+
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+ ac_fn_c_check_header_mongrel "$LINENO" "seccomp.h" "ac_cv_header_seccomp_h" "$ac_includes_default"
+if test "x$ac_cv_header_seccomp_h" = xyes; then :
+
+else
+ as_fn_error $? "You must install the seccomp development package in order to compile lxc" "$LINENO" 5
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for seccomp_init in -lseccomp" >&5
+$as_echo_n "checking for seccomp_init in -lseccomp... " >&6; }
+if ${ac_cv_lib_seccomp_seccomp_init+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lseccomp $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char seccomp_init ();
+int
+main ()
+{
+return seccomp_init ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_seccomp_seccomp_init=yes
+else
+ ac_cv_lib_seccomp_seccomp_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_seccomp_seccomp_init" >&5
+$as_echo "$ac_cv_lib_seccomp_seccomp_init" >&6; }
+if test "x$ac_cv_lib_seccomp_seccomp_init" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSECCOMP 1
+_ACEOF
+
+ LIBS="-lseccomp $LIBS"
+
+else
+ as_fn_error $? "You must install the seccomp development package in order to compile lxc" "$LINENO" 5
+fi
+
+ SECCOMP_LIBS=-lseccomp
+
+
+else
+ SECCOMP_CFLAGS=$pkg_cv_SECCOMP_CFLAGS
+ SECCOMP_LIBS=$pkg_cv_SECCOMP_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+fi
+
+# HAVE_SCMP_FILTER_CTX=1 will tell us we have libseccomp api >= 1.0.0
+OLD_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $SECCOMP_CFLAGS"
+ac_fn_c_check_type "$LINENO" "scmp_filter_ctx" "ac_cv_type_scmp_filter_ctx" "#include <seccomp.h>
+"
+if test "x$ac_cv_type_scmp_filter_ctx" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SCMP_FILTER_CTX 1
+_ACEOF
+
+
+fi
+
+CFLAGS="$OLD_CFLAGS"
+
+# Configuration examples
+# Check whether --enable-examples was given.
+if test "${enable_examples+set}" = set; then :
+ enableval=$enable_examples;
+else
+ enable_examples=yes
+fi
+
+ if test "x$enable_examples" = "xyes"; then
+ ENABLE_EXAMPLES_TRUE=
+ ENABLE_EXAMPLES_FALSE='#'
+else
+ ENABLE_EXAMPLES_TRUE='#'
+ ENABLE_EXAMPLES_FALSE=
+fi
+
+
+# Python3 module and scripts
+# Check whether --enable-python was given.
+if test "${enable_python+set}" = set; then :
+ enableval=$enable_python; enable_python=yes
+else
+ enable_python=no
+fi
+
+ if test "x$enable_python" = "xyes"; then
+ ENABLE_PYTHON_TRUE=
+ ENABLE_PYTHON_FALSE='#'
+else
+ ENABLE_PYTHON_TRUE='#'
+ ENABLE_PYTHON_FALSE=
+fi
+
+
if test -z "$ENABLE_PYTHON_TRUE"; then :
diff --git a/src/lxc/Makefile.in b/src/lxc/Makefile.in
index d6841c6..b97b429 100644
--- a/src/lxc/Makefile.in
+++ b/src/lxc/Makefile.in
@@ -65,7 +65,7 @@ so_PROGRAMS = liblxc.so$(EXEEXT)
@HAVE_FGETLN_TRUE@@HAVE_GETLINE_FALSE@am__append_4 = ../include/getline.c ../include/getline.h
@ENABLE_APPARMOR_TRUE@am__append_5 = -DHAVE_APPARMOR
@USE_CONFIGPATH_LOGS_TRUE@am__append_6 = -DUSE_CONFIGPATH_LOGS
-@ENABLE_SECCOMP_TRUE@am__append_7 = -DHAVE_SECCOMP
+@ENABLE_SECCOMP_TRUE@am__append_7 = -DHAVE_SECCOMP $(SECCOMP_CFLAGS)
@ENABLE_SECCOMP_TRUE@am__append_8 = seccomp.c
@ENABLE_PYTHON_TRUE@am__append_9 = lxc-device lxc-ls \
@ENABLE_PYTHON_TRUE@ lxc-start-ephemeral
@@ -344,6 +344,7 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
+SECCOMP_CFLAGS = @SECCOMP_CFLAGS@
SECCOMP_LIBS = @SECCOMP_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
