From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8CB571388BF for ; Thu, 14 Jan 2016 17:33:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83B1DE080E; Thu, 14 Jan 2016 17:33:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E5F72E07B2 for ; Thu, 14 Jan 2016 17:33:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CDEB1340AA1 for ; Thu, 14 Jan 2016 17:33:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3104DE6B for ; Thu, 14 Jan 2016 17:33:25 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1452737466.b34df9dd817069ade7e0526a59aaa9d3f2beb806.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: src/rc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/rc/Makefile src/rc/rc-selinux.c X-VCS-Directories: src/rc/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: b34df9dd817069ade7e0526a59aaa9d3f2beb806 X-VCS-Branch: master Date: Thu, 14 Jan 2016 17:33:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4d133021-1fcb-427d-80e0-c94424d2a335 X-Archives-Hash: 59da571b2158d803c1fa4c2363762a4a commit: b34df9dd817069ade7e0526a59aaa9d3f2beb806 Author: William Hubbs gmail com> AuthorDate: Thu Jan 14 02:11:06 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Jan 14 02:11:06 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=b34df9dd fix selinux build src/rc/Makefile | 10 ++++++++-- src/rc/rc-selinux.c | 4 ---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/rc/Makefile b/src/rc/Makefile index 1df26d8..da1e5ee 100644 --- a/src/rc/Makefile +++ b/src/rc/Makefile @@ -75,7 +75,10 @@ check test:: 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} 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 ${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} openrc-run runscript: openrc-run.o _usage.o rc-misc.o rc-plugin.o diff --git a/src/rc/rc-selinux.c b/src/rc/rc-selinux.c index 3e484a6..ed89be1 100644 --- a/src/rc/rc-selinux.c +++ b/src/rc/rc-selinux.c @@ -15,8 +15,6 @@ * except according to the terms contained in the LICENSE file. */ -#ifdef HAVE_SELINUX - #include #include #include @@ -386,5 +384,3 @@ out: free(run_init_t); free(curr_t); } - -#endif