Gentoo Archives: gentoo-commits

From: Jason Zaman <perfinion@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: /
Date: Thu, 31 Mar 2022 03:31:37
Message-Id: 1648694453.901d5bbe56a07b57a4bd4368bb82275c628f6a09.perfinion@gentoo
1 commit: 901d5bbe56a07b57a4bd4368bb82275c628f6a09
2 Author: Christian Göttsche <cgzones <AT> googlemail <DOT> com>
3 AuthorDate: Tue Mar 22 17:11:36 2022 +0000
4 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 31 02:40:53 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=901d5bbe
7
8 Makefile: use override for adding options
9
10 When adding program options to checkpolicy and checkmodule use
11 override to add them even when CHECKPOLICY or CHECKMODULE have been
12 set by the caller.
13
14 Signed-off-by: Christian Göttsche <cgzones <AT> googlemail.com>
15 Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
16
17 Makefile | 10 +++++-----
18 1 file changed, 5 insertions(+), 5 deletions(-)
19
20 diff --git a/Makefile b/Makefile
21 index 9b5069b9..84c019f9 100644
22 --- a/Makefile
23 +++ b/Makefile
24 @@ -173,16 +173,16 @@ docsdir := $(prefix)/share/doc/$(PKGNAME)
25 # enable MLS if requested.
26 ifeq "$(TYPE)" "mls"
27 M4PARAM += -D enable_mls=true
28 - CHECKPOLICY += -M
29 - CHECKMODULE += -M
30 + override CHECKPOLICY += -M
31 + override CHECKMODULE += -M
32 gennetfilter += -m
33 endif
34
35 # enable MLS if MCS requested.
36 ifeq "$(TYPE)" "mcs"
37 M4PARAM += -D enable_mcs=true
38 - CHECKPOLICY += -M
39 - CHECKMODULE += -M
40 + override CHECKPOLICY += -M
41 + override CHECKMODULE += -M
42 gennetfilter += -c
43 endif
44
45 @@ -200,7 +200,7 @@ ifeq "$(SYSTEMD)" "y"
46 endif
47
48 ifneq ($(OUTPUT_POLICY),)
49 - CHECKPOLICY += -c $(OUTPUT_POLICY)
50 + override CHECKPOLICY += -c $(OUTPUT_POLICY)
51 endif
52
53 ifneq "$(CUSTOM_BUILDOPT)" ""