diff options
Diffstat (limited to 'recipes-mac')
| -rw-r--r-- | recipes-mac/AppArmor/apparmor_2.13.4.bb | 1 | ||||
| -rw-r--r-- | recipes-mac/AppArmor/files/0001-tests-regression-fix-failure-on-older-versions-of-Ma.patch | 40 |
2 files changed, 41 insertions, 0 deletions
diff --git a/recipes-mac/AppArmor/apparmor_2.13.4.bb b/recipes-mac/AppArmor/apparmor_2.13.4.bb index 6ba1ea8..c1f038f 100644 --- a/recipes-mac/AppArmor/apparmor_2.13.4.bb +++ b/recipes-mac/AppArmor/apparmor_2.13.4.bb @@ -24,6 +24,7 @@ SRC_URI = " \ file://0001-Makefile.am-suppress-perllocal.pod.patch \ file://run-ptest \ file://0001-regression-tests-Don-t-build-syscall_sysctl-if-missi.patch \ + file://0001-tests-regression-fix-failure-on-older-versions-of-Ma.patch \ " SRCREV = "df0ac742f7a1146181d8734d03334494f2015134" diff --git a/recipes-mac/AppArmor/files/0001-tests-regression-fix-failure-on-older-versions-of-Ma.patch b/recipes-mac/AppArmor/files/0001-tests-regression-fix-failure-on-older-versions-of-Ma.patch new file mode 100644 index 0000000..a23d889 --- /dev/null +++ b/recipes-mac/AppArmor/files/0001-tests-regression-fix-failure-on-older-versions-of-Ma.patch @@ -0,0 +1,40 @@ +From bf8c4ca570c27cf58e882e03680b40357223e6e7 Mon Sep 17 00:00:00 2001 +From: John Johansen <john.johansen@canonical.com> +Date: Wed, 30 Sep 2020 13:36:23 -0700 +Subject: [PATCH] tests regression: fix failure on older versions of Make + +Older versions of Make will choke on the # character in the $(shell +expression, treating it as the beginning of a comment. Resulting in +the following error + +make unterminated call to function 'shell': missing ')'. Stop. + +MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/639 +Signed-off-by: John Johansen <john.johansen@canonical.com> +Acked-by: Steve Beattie <steve.beattie@canonical.com> +(cherry picked from commit 8cf3534a5b11643c5913e5eb74e491f2f014d792) + +Upstream-Status: Backport +[Minor fixup] +Signed-off-by: Armin Kuster <akuster808@gmail.com> +--- + tests/regression/apparmor/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/regression/apparmor/Makefile b/tests/regression/apparmor/Makefile +index c3d0cfb7..1d55547c 100644 +--- a/tests/regression/apparmor/Makefile ++++ b/tests/regression/apparmor/Makefile +@@ -69,7 +69,8 @@ endif # USE_SYSTEM + + CFLAGS += -g -O0 -Wall -Wstrict-prototypes + +-USE_SYSCTL:=$(shell echo "#include <sys/sysctl.h>" | cpp -dM >/dev/null 2>/dev/null && echo true) ++SYSCTL_INCLUDE="\#include <sys/sysctl.h>" ++USE_SYSCTL:=$(shell echo $(SYSCTL_INCLUDE) | cpp -dM >/dev/null 2>/dev/null && echo true) + + + SRC=access.c \ +-- +2.17.1 + |