Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
a668d196
Commit
a668d196
authored
Jun 19, 2014
by
Dwight Engen
Committed by
Stéphane Graber
Jun 30, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
split -lcap and -lselinux out of LIBS
Signed-off-by:
Dwight Engen
<
dwight.engen@oracle.com
>
Acked-by:
Serge E. Hallyn
<
serge.hallyn@ubuntu.com
>
parent
010898a9
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
configure.ac
configure.ac
+3
-3
Makefile.am
src/lxc/Makefile.am
+2
-2
No files found.
configure.ac
View file @
a668d196
...
@@ -218,8 +218,8 @@ fi
...
@@ -218,8 +218,8 @@ fi
AM_CONDITIONAL([ENABLE_SELINUX], [test "x$enable_selinux" = "xyes"])
AM_CONDITIONAL([ENABLE_SELINUX], [test "x$enable_selinux" = "xyes"])
AM_COND_IF([ENABLE_SELINUX],
AM_COND_IF([ENABLE_SELINUX],
[AC_CHECK_HEADER([selinux/selinux.h],[],[AC_MSG_ERROR([You must install the SELinux development package in order to compile lxc])])
[AC_CHECK_HEADER([selinux/selinux.h],[],[AC_MSG_ERROR([You must install the SELinux development package in order to compile lxc])])
AC_CHECK_LIB([selinux], [setexeccon_raw],[],[AC_MSG_ERROR([You must install the SELinux development package in order to compile lxc])])
AC_CHECK_LIB([selinux], [setexeccon_raw],[
true
],[AC_MSG_ERROR([You must install the SELinux development package in order to compile lxc])])
AC_SUBST([SELINUX_LIBS])])
AC_SUBST([SELINUX_LIBS]
, [-lselinux]
)])
# Seccomp syscall filter
# Seccomp syscall filter
AC_ARG_ENABLE([seccomp],
AC_ARG_ENABLE([seccomp],
...
@@ -277,7 +277,7 @@ fi
...
@@ -277,7 +277,7 @@ fi
AM_CONDITIONAL([ENABLE_CAP], [test "x$enable_capabilities" = "xyes"])
AM_CONDITIONAL([ENABLE_CAP], [test "x$enable_capabilities" = "xyes"])
AM_COND_IF([ENABLE_CAP],
AM_COND_IF([ENABLE_CAP],
[AC_CHECK_LIB(cap,cap_set_proc,[],[AC_MSG_ERROR([You are missing libcap support.])])
[AC_CHECK_LIB(cap,cap_set_proc,[
true
],[AC_MSG_ERROR([You are missing libcap support.])])
AC_SUBST([CAP_LIBS], [-lcap])])
AC_SUBST([CAP_LIBS], [-lcap])])
# HAVE_SCMP_FILTER_CTX=1 will tell us we have libseccomp api >= 1.0.0
# HAVE_SCMP_FILTER_CTX=1 will tell us we have libseccomp api >= 1.0.0
...
...
src/lxc/Makefile.am
View file @
a668d196
...
@@ -152,7 +152,7 @@ liblxc_so_LDFLAGS = \
...
@@ -152,7 +152,7 @@ liblxc_so_LDFLAGS = \
-shared
\
-shared
\
-Wl
,-soname,liblxc.so.
$
(
firstword
$
(
subst ., ,
$(VERSION)
))
-Wl
,-soname,liblxc.so.
$
(
firstword
$
(
subst ., ,
$(VERSION)
))
liblxc_so_LDADD
=
$(CAP_LIBS)
$(APPARMOR_LIBS)
$(SECCOMP_LIBS)
liblxc_so_LDADD
=
$(CAP_LIBS)
$(APPARMOR_LIBS)
$(SE
LINUX_LIBS)
$(SE
CCOMP_LIBS)
if
ENABLE_CGMANAGER
if
ENABLE_CGMANAGER
liblxc_so_LDADD
+=
$(CGMANAGER_LIBS)
$(DBUS_LIBS)
$(NIH_LIBS)
$(NIH_DBUS_LIBS)
liblxc_so_LDADD
+=
$(CGMANAGER_LIBS)
$(DBUS_LIBS)
$(NIH_LIBS)
$(NIH_DBUS_LIBS)
...
@@ -208,7 +208,7 @@ AM_LDFLAGS = -Wl,-E
...
@@ -208,7 +208,7 @@ AM_LDFLAGS = -Wl,-E
if
ENABLE_RPATH
if
ENABLE_RPATH
AM_LDFLAGS
+=
-Wl
,-rpath
-Wl
,
$(libdir)
AM_LDFLAGS
+=
-Wl
,-rpath
-Wl
,
$(libdir)
endif
endif
LDADD
=
liblxc.so @CAP_LIBS@ @APPARMOR_LIBS@ @SECCOMP_LIBS@
LDADD
=
liblxc.so @CAP_LIBS@ @APPARMOR_LIBS@ @SE
LINUX_LIBS@ @SE
CCOMP_LIBS@
lxc_attach_SOURCES
=
lxc_attach.c
lxc_attach_SOURCES
=
lxc_attach.c
lxc_autostart_SOURCES
=
lxc_autostart.c
lxc_autostart_SOURCES
=
lxc_autostart.c
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment