summaryrefslogtreecommitdiffstats
path: root/recipes-mac/AppArmor/files/tool-paths.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-mac/AppArmor/files/tool-paths.patch')
-rw-r--r--recipes-mac/AppArmor/files/tool-paths.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/recipes-mac/AppArmor/files/tool-paths.patch b/recipes-mac/AppArmor/files/tool-paths.patch
new file mode 100644
index 0000000..aaf08da
--- /dev/null
+++ b/recipes-mac/AppArmor/files/tool-paths.patch
@@ -0,0 +1,37 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From e7edd937adcbf1b3c8d38a31de5bacb2029b1965 Mon Sep 17 00:00:00 2001
5From: John Johansen <john.johansen@canonical.com>
6Date: Thu, 4 Oct 2018 23:15:28 -0700
7Subject: [PATCH] parser: fix Makefile hardcoded paths to flex and bison
8
9The hardcoded paths for flex and python can break builds on systems
10where those tools are stored in an alternate location. Use which
11to lookup where flex and bison are available.
12
13This fixes issue #4
14
15Signed-off-by: John Johansen <john.johansen@canonical.com>
16---
17 parser/Makefile | 4 ++--
18 1 file changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/parser/Makefile b/parser/Makefile
21index 4d370c36..015c218d 100644
22--- a/parser/Makefile
23+++ b/parser/Makefile
24@@ -27,9 +27,9 @@ INSTALL_CONFDIR=${DESTDIR}${CONFDIR}
25 LOCALEDIR=/usr/share/locale
26 MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 subdomain.conf.5
27
28-YACC := /usr/bin/bison
29+YACC := bison
30 YFLAGS := -d
31-LEX := /usr/bin/flex
32+LEX := flex
33 LEXFLAGS = -B -v
34 WARNINGS = -Wall
35 EXTRA_WARNINGS = -Wsign-compare -Wmissing-field-initializers -Wformat-security -Wunused-parameter
36--
372.11.0