emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix selinux build

Browse Source
This commit is contained in:
William Hubbs 2016-01-13 20:11:06 -06:00
parent 6f02069746
commit b34df9dd81
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rc/Makefile
View File

@ -75,7 +75,10 @@ check test::
all: ${ALL_PROGS} all: ${ALL_PROGS}
checkpath: checkpath.o _usage.o rc-misc.o rc-selinux.o checkpath: checkpath.o _usage.o rc-misc.o
ifeq (${MKSELINUX},yes)
checkpath: rc-selinux.o
endif
${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD} ${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
einfon einfo ewarnn ewarn eerrorn eerror ebegin eend ewend \ einfon einfo ewarnn ewarn eerrorn eerror ebegin eend ewend \
@ -101,7 +104,10 @@ mark_service_hotplugged mark_service_failed: do_mark_service.o rc-misc.o
mountinfo: mountinfo.o _usage.o rc-misc.o mountinfo: mountinfo.o _usage.o rc-misc.o
${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD} ${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
openrc rc: rc.o rc-logger.o rc-misc.o rc-plugin.o rc-selinux.o _usage.o openrc rc: rc.o rc-logger.o rc-misc.o rc-plugin.o _usage.o
ifeq (${MKSELINUX},yes)
openrc rc: rc-selinux.o
endif
${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD} ${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
openrc-run runscript: openrc-run.o _usage.o rc-misc.o rc-plugin.o openrc-run runscript: openrc-run.o _usage.o rc-misc.o rc-plugin.o

4
src/rc/rc-selinux.c
View File

@ -15,8 +15,6 @@
* except according to the terms contained in the LICENSE file. * except according to the terms contained in the LICENSE file.
*/ */
#ifdef HAVE_SELINUX
#include <stddef.h> #include <stddef.h>
#include <errno.h> #include <errno.h>
#include <dlfcn.h> #include <dlfcn.h>
@ -386,5 +384,3 @@ out:
free(run_init_t); free(run_init_t);
free(curr_t); free(curr_t);
} }
#endif