From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AAD7B15808B for ; Thu, 31 Mar 2022 03:31:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 169DDE081E; Thu, 31 Mar 2022 03:31:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8B054E07C9 for ; Thu, 31 Mar 2022 03:31:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9A1663414DD for ; Thu, 31 Mar 2022 03:31:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9EFA7361 for ; Thu, 31 Mar 2022 03:31:23 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1648694453.901d5bbe56a07b57a4bd4368bb82275c628f6a09.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: / X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: Makefile X-VCS-Directories: / X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 901d5bbe56a07b57a4bd4368bb82275c628f6a09 X-VCS-Branch: master Date: Thu, 31 Mar 2022 03:31:23 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7da280dd-2313-44c1-9c33-20fb33f9d132 X-Archives-Hash: 4859f313f26f243d38cc503e31939ef9 commit: 901d5bbe56a07b57a4bd4368bb82275c628f6a09 Author: Christian Göttsche googlemail com> AuthorDate: Tue Mar 22 17:11:36 2022 +0000 Commit: Jason Zaman gentoo org> CommitDate: Thu Mar 31 02:40:53 2022 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=901d5bbe Makefile: use override for adding options When adding program options to checkpolicy and checkmodule use override to add them even when CHECKPOLICY or CHECKMODULE have been set by the caller. Signed-off-by: Christian Göttsche googlemail.com> Signed-off-by: Jason Zaman gentoo.org> Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 9b5069b9..84c019f9 100644 --- a/Makefile +++ b/Makefile @@ -173,16 +173,16 @@ docsdir := $(prefix)/share/doc/$(PKGNAME) # enable MLS if requested. ifeq "$(TYPE)" "mls" M4PARAM += -D enable_mls=true - CHECKPOLICY += -M - CHECKMODULE += -M + override CHECKPOLICY += -M + override CHECKMODULE += -M gennetfilter += -m endif # enable MLS if MCS requested. ifeq "$(TYPE)" "mcs" M4PARAM += -D enable_mcs=true - CHECKPOLICY += -M - CHECKMODULE += -M + override CHECKPOLICY += -M + override CHECKMODULE += -M gennetfilter += -c endif @@ -200,7 +200,7 @@ ifeq "$(SYSTEMD)" "y" endif ifneq ($(OUTPUT_POLICY),) - CHECKPOLICY += -c $(OUTPUT_POLICY) + override CHECKPOLICY += -c $(OUTPUT_POLICY) endif ifneq "$(CUSTOM_BUILDOPT)" ""