mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-03 09:19:33 +00:00
Code Issues Releases Wiki Activity

configure: fix strchrnul conditiona compilation

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner
2021-03-21 16:02:40 +01:00
parent 3c09417b48
commit 682ae75628
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -640,7 +640,7 @@ AC_CHECK_HEADER([ifaddrs.h],
AC_HEADER_MAJOR AC_HEADER_MAJOR
# Check for some syscalls functions # Check for some syscalls functions
AC_CHECK_FUNCS([setns pivot_root sethostname unshare rand_r confstr faccessat gettid memfd_create move_mount open_tree execveat clone3 fsopen fspick fsconfig fsmount, openat2, close_range, statvfs, strchrnul]) AC_CHECK_FUNCS([setns pivot_root sethostname unshare rand_r confstr faccessat gettid memfd_create move_mount open_tree execveat clone3 fsopen fspick fsconfig fsmount, openat2, close_range, statvfs])
AC_CHECK_TYPES([__aligned_u64], [], [], [[#include <linux/types.h>]]) AC_CHECK_TYPES([__aligned_u64], [], [], [[#include <linux/types.h>]])
AC_CHECK_TYPES([struct open_how], [], [], [[#include <linux/openat2.h>]]) AC_CHECK_TYPES([struct open_how], [], [], [[#include <linux/openat2.h>]])
AC_CHECK_TYPES([struct clone_args], [], [], [[#include <linux/sched.h>]]) AC_CHECK_TYPES([struct clone_args], [], [], [[#include <linux/sched.h>]])
@@ -727,6 +727,10 @@ AC_CHECK_FUNCS([strlcat],
AM_CONDITIONAL(HAVE_STRLCAT, true) AM_CONDITIONAL(HAVE_STRLCAT, true)
AC_DEFINE(HAVE_STRLCAT,1,[Have strlcat]), AC_DEFINE(HAVE_STRLCAT,1,[Have strlcat]),
AM_CONDITIONAL(HAVE_STRLCAT, false)) AM_CONDITIONAL(HAVE_STRLCAT, false))
AC_CHECK_FUNCS([strchrnul],
AM_CONDITIONAL(HAVE_STRCHRNUL, true)
AC_DEFINE(HAVE_STRCHRNUL,1,[Have strchnul]),
AM_CONDITIONAL(HAVE_STRCHRNUL, false))
AC_CHECK_FUNCS([fmemopen], AC_CHECK_FUNCS([fmemopen],
AM_CONDITIONAL(HAVE_FMEMOPEN, true) AM_CONDITIONAL(HAVE_FMEMOPEN, true)
AC_DEFINE(HAVE_FMEMOPEN,1,[Have fmemopen]), AC_DEFINE(HAVE_FMEMOPEN,1,[Have fmemopen]),

4
src/lxc/Makefile.am
View File

@@ -201,6 +201,10 @@ if !HAVE_STRLCAT
liblxc_la_SOURCES += ../include/strlcat.c ../include/strlcat.h liblxc_la_SOURCES += ../include/strlcat.c ../include/strlcat.h
endif endif
if !HAVE_STRCHRNUL
liblxc_la_SOURCES += ../include/strchrnul.c ../include/strchrnul.h
endif
if ENFORCE_MEMFD_REXEC if ENFORCE_MEMFD_REXEC
liblxc_la_SOURCES += rexec.c rexec.h liblxc_la_SOURCES += rexec.c rexec.h
endif endif