summaryrefslogtreecommitdiffstats
path: root/recipes-mac/AppArmor/files/0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2021-06-23 17:15:03 +0800
committerArmin Kuster <akuster808@gmail.com>2021-07-10 05:16:26 -0700
commit366bd7026fe5a6d4d8465b87118948de97f2310f (patch)
treeb92f05fa138313da5cfaf0f22ecb4b90c0871ce6 /recipes-mac/AppArmor/files/0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch
parent5fbf2b8b7f4c21f1cdbb2f9e198704165aec569c (diff)
downloadmeta-security-366bd7026fe5a6d4d8465b87118948de97f2310f.tar.gz
apparmor: upgrade 3.0 -> 3.0.1
Drop backport patches: 0001-apparmor-fix-manpage-order.patch 0001-libapparmor-add-missing-include-for-socklen_t.patch 0002-libapparmor-add-aa_features_new_from_file-to-public-.patch 0003-libapparmor-add-_aa_asprintf-to-private-symbols.patch 0001-aa_status-Fix-build-issue-with-musl.patch 0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Diffstat (limited to 'recipes-mac/AppArmor/files/0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch')
-rw-r--r--recipes-mac/AppArmor/files/0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/recipes-mac/AppArmor/files/0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch b/recipes-mac/AppArmor/files/0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch
deleted file mode 100644
index 9f7ad3c..0000000
--- a/recipes-mac/AppArmor/files/0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 965bb9c3e464f756b258a7c259a92bce3cde74e7 Mon Sep 17 00:00:00 2001
2From: Armin Kuster <akuster@mvista.com>
3Date: Wed, 7 Oct 2020 20:50:38 -0700
4Subject: [PATCH] parser/Makefile: dont force host cpp to detect reallocarray
5
6In cross build environments, using the hosts cpp gives incorrect
7detection of reallocarray. Change cpp to a variable.
8
9fixes:
10parser_misc.c: In function 'int capable_add_cap(const char*, int, unsigned int, capability_flags)':
11| parser_misc.c:297:37: error: 'reallocarray' was not declared in this scope
12| 297 | tmp = (struct capability_table *) reallocarray(cap_table, sizeof(struct capability_table), cap_table_size+1);
13
14Signed-off-by: Armin Kuster <akuster808@gmail.com>
15
16Upstream-Status: Pending
17
18---
19 parser/Makefile | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/parser/Makefile b/parser/Makefile
23index acef3d77..8250ac45 100644
24--- a/parser/Makefile
25+++ b/parser/Makefile
26@@ -54,7 +54,7 @@ endif
27 CPPFLAGS += -D_GNU_SOURCE
28
29 STDLIB_INCLUDE:="\#include <stdlib.h>"
30-HAVE_REALLOCARRAY:=$(shell echo $(STDLIB_INCLUDE) | cpp ${CPPFLAGS} | grep -q reallocarray && echo true)
31+HAVE_REALLOCARRAY:=$(shell echo $(STDLIB_INCLUDE) | ${CPP} ${CPPFLAGS} | grep -q reallocarray && echo true)
32
33 WARNINGS = -Wall
34 CXX_WARNINGS = ${WARNINGS} ${EXTRA_WARNINGS}
35--
362.17.1
37