From patchwork Wed Oct 26 22:04:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Bigonville X-Patchwork-Id: 9398511 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C2989600BA for ; Wed, 26 Oct 2016 22:05:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A9BB29B7C for ; Wed, 26 Oct 2016 22:05:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7CF8229DFF; Wed, 26 Oct 2016 22:05:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from emsm-gh1-uea10.nsa.gov (emsm-gh1-uea10.nsa.gov [8.44.101.8]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DA15429B7C for ; Wed, 26 Oct 2016 22:05:23 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.31,551,1473120000"; d="scan'208";a="308052" IronPort-PHdr: =?us-ascii?q?9a23=3AqOrb/hdkUtvzN56OsEkfIWe7lGMj4u6mDksu8pMi?= =?us-ascii?q?zoh2WeGdxc6/ZR7h7PlgxGXEQZ/co6odzbGH6ea/ASdYut6oizMrSNR0TRgLiM?= =?us-ascii?q?EbzUQLIfWuLgnFFsPsdDEwB89YVVVorDmROElRH9viNRWJ+iXhpQAbFhi3Dwdp?= =?us-ascii?q?POO9QteU1JXtkb/qsMWIKyxzxxOFKYtoKxu3qQiD/uI3uqBFbpgL9x3Sv3FTcP?= =?us-ascii?q?5Xz247bXianhL7+9vitMU7q3cYhuglv/Jkfe26Ov1gDO8QMDNzKG0x5cv2pTHf?= =?us-ascii?q?XACP4T0aSWxQnR1WUCbf6xSvep7sqCb8qqJX2SadO9P3SbQ5EWCo7qhsTjfkhS?= =?us-ascii?q?0GPjh/93vY3J8jxJlHqQ6s8kQsi7XfZ5uYYb8nJq4=3D?= X-IPAS-Result: =?us-ascii?q?A2EIJwB2JxFY/wHyM5BdHQEFAQsBgxQWAQEBAQEdgUoLowY?= =?us-ascii?q?LBpdZJoF7hhhTAQEBAQEBAQECAQJfKEISAYFeBAMTBXlbRAI3BgEBDCAMAgMJA?= =?us-ascii?q?hcIIQgIAwEtCwofCwUYBIgzAQMBsj2FMAEBBYgyHQiFcok3AhEBaIUTmhuQFQu?= =?us-ascii?q?KCYV5ApEJAlRegwqBf3CFCYEfDxdhgTEBAQE?= Received: from unknown (HELO tarius.tycho.ncsc.mil) ([144.51.242.1]) by emsm-gh1-uea10.nsa.gov with ESMTP; 26 Oct 2016 22:05:22 +0000 Received: from prometheus.infosec.tycho.ncsc.mil (prometheus [192.168.25.40]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u9QM54t2002442; Wed, 26 Oct 2016 18:05:09 -0400 Received: from tarius.tycho.ncsc.mil (tarius.infosec.tycho.ncsc.mil [144.51.242.1]) by prometheus.infosec.tycho.ncsc.mil (8.15.2/8.15.2) with ESMTP id u9QM52dR102962 for ; Wed, 26 Oct 2016 18:05:02 -0400 Received: from goalie.tycho.ncsc.mil (goalie [144.51.242.250]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u9QM5122002439 for ; Wed, 26 Oct 2016 18:05:01 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1D8GgA7KBFY/2OteVtdHQEFAQsBgxQWAQEBAQEdgUoLowYLBpNLhC+IGFMBAgEBAQEBAmIohSkBATgvbTSIVQMBsjyFMAEBBYhPCIVyiTd8hROaG5AVC5ACApEJAlRegkcMN4F/cIYogjgBAQE X-IPAS-Result: A1D8GgA7KBFY/2OteVtdHQEFAQsBgxQWAQEBAQEdgUoLowYLBpNLhC+IGFMBAgEBAQEBAmIohSkBATgvbTSIVQMBsjyFMAEBBYhPCIVyiTd8hROaG5AVC5ACApEJAlRegkcMN4F/cIYogjgBAQE X-IronPort-AV: E=Sophos;i="5.31,551,1473134400"; d="scan'208";a="5788194" Received: from emsm-gh1-uea11.corp.nsa.gov (HELO emsm-gh1-uea11.nsa.gov) ([10.208.41.37]) by goalie.tycho.ncsc.mil with ESMTP; 26 Oct 2016 18:04:35 -0400 IronPort-PHdr: =?us-ascii?q?9a23=3AyaJ0mRNf36aRe8OzYhQl6mtUPXoX/o7sNwtQ0KIM?= =?us-ascii?q?zox0KP/9rarrMEGX3/hxlliBBdydsKMezbWO+Pi7EUU7or+5+EgYd5JNUxJXwe?= =?us-ascii?q?43pCcHRPC/NEvgMfTxZDY7FskRHHVs/nW8LFQHUJ2mPw6anHS+4HYoFwnlMkIt?= =?us-ascii?q?f6KuS9SU0Jz8j7v60qaQSj0AvCC6b7J2IUf+hiTqne5Sv7FfLL0swADCuHpCdr?= =?us-ascii?q?ce72ppIVWOg0S0vZ/or9YwuxhX7uks889GTLXSY7UzTbseCi8vdW8y+p7Frx7G?= =?us-ascii?q?GC+G+2ERVHleuBtHBA7b7RX+U9+luCr1sexV1CSQPMTwC7cuVmLxvO9QVBb0hX?= =?us-ascii?q?JfZHYC+2bNh5kogQ=3D=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0GkHQDGJxFY/2OteVtdHgYMGQYMgmkWA?= =?us-ascii?q?QEBAQEdgUoLowYLBpNLhC+CAIYYUwEBAQEBAQEBAgECXyiCMxiBAFuBAwEBOC9?= =?us-ascii?q?tNIhVAwGyPYUwAQEFiE8IhXKJN3yFE5obkBULkAICkQkCVF6CRww3gX9whiiCO?= =?us-ascii?q?AEBAQ?= X-IPAS-Result: =?us-ascii?q?A0GkHQDGJxFY/2OteVtdHgYMGQYMgmkWAQEBAQEdgUoLowY?= =?us-ascii?q?LBpNLhC+CAIYYUwEBAQEBAQEBAgECXyiCMxiBAFuBAwEBOC9tNIhVAwGyPYUwA?= =?us-ascii?q?QEFiE8IhXKJN3yFE5obkBULkAICkQkCVF6CRww3gX9whiiCOAEBAQ?= X-IronPort-AV: E=Sophos;i="5.31,551,1473120000"; d="scan'208";a="256722" Received: from anor.bigon.be ([91.121.173.99]) by emsm-gh1-uea11.nsa.gov with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Oct 2016 22:04:34 +0000 Received: from anor.bigon.be (localhost.localdomain [127.0.0.1]) by anor.bigon.be (Postfix) with ESMTP id CF08A1A1A8 for ; Thu, 27 Oct 2016 00:04:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=bigon.be; h= x-mailer:message-id:date:date:subject:subject:from:from:received :received:received; s=key1; t=1477519471; x=1479333872; bh=0Pq3l vLTtIGgvxr5smqyS25o0CpsK6HVKG9umNtQFQE=; b=bDq7E5nVh0whGDcUcKV9C 6GD6ktqon/La6LS+SrWGoeIRt7vpKff65CGYX23vatOOf+Qee7TlPIzoGxnPJxGt Pb7CidoMAYc9b4GeKuXjZU5XqHaSw13VdZzDfKjdUw1kMk2UhP9hu+9LoNaIIy7x fTBGEqWTqa7OoCXsPkynpo= X-Virus-Scanned: Debian amavisd-new at bigon.be Received: from anor.bigon.be ([127.0.0.1]) by anor.bigon.be (anor.bigon.be [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 1YX-9MaphyAs for ; Thu, 27 Oct 2016 00:04:31 +0200 (CEST) Received: from fornost.bigon.be (unknown [IPv6:2a02:a03f:6c:e500:edf:2fd8:fc0a:f176]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: bigon) by anor.bigon.be (Postfix) with ESMTPSA id 0C2C41A06E for ; Thu, 27 Oct 2016 00:04:31 +0200 (CEST) Received: from bigon (uid 1000) (envelope-from bigon@bigon.be) id 3fc39 by fornost.bigon.be (DragonFly Mail Agent v0.11); Thu, 27 Oct 2016 00:04:30 +0200 From: Laurent Bigonville To: selinux@tycho.nsa.gov Subject: [PATCH] libselinux: Allow overriding libsepol.a location during build Date: Thu, 27 Oct 2016 00:04:30 +0200 Message-Id: <20161026220430.2403-1-bigon@debian.org> X-Mailer: git-send-email 2.10.1 X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: MIME-Version: 1.0 Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Virus-Scanned: ClamAV using ClamSMTP From: Laurent Bigonville Signed-off-by: Laurent Bigonville --- libselinux/src/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile index c9f35b1..ae40f80 100644 --- a/libselinux/src/Makefile +++ b/libselinux/src/Makefile @@ -18,6 +18,7 @@ RUBYLIBVER ?= $(shell $(RUBY) -e 'print RUBY_VERSION.split(".")[0..1].join(".")' RUBYINC ?= $(shell $(PKG_CONFIG) --exists ruby-$(RUBYLIBVER) && $(PKG_CONFIG) --cflags ruby-$(RUBYLIBVER) || $(PKG_CONFIG) --cflags ruby) RUBYINSTALL ?= $(DESTDIR)$(shell $(RUBY) -e 'puts RbConfig::CONFIG["vendorarchdir"]') LIBBASE ?= $(shell basename $(LIBDIR)) +LIBSEPOLA ?= $(LIBDIR)/libsepol.a VERSION = $(shell cat ../VERSION) LIBVERSION = 1 @@ -146,7 +147,7 @@ $(AUDIT2WHYLOBJ): audit2why.c $(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $< $(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) - $(CC) $(CFLAGS) -shared -o $@ $^ -L. $(LDFLAGS) -lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR) + $(CC) $(CFLAGS) -shared -o $@ $^ -L. $(LDFLAGS) -lselinux $(LIBSEPOLA) -L$(LIBDIR) %.o: %.c policy.h $(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $<