summaryrefslogtreecommitdiffstats
path: root/recipes-security
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2021-02-28 19:20:44 +0000
committerArmin Kuster <akuster808@gmail.com>2021-03-02 11:56:27 -0800
commit9bb7fa51a59fe80080746a763b4f530c4ba29f4e (patch)
treeb164e9326f789eab5be2d7a82eb575c4f95cab7c /recipes-security
parentd7391ab934745af9949292998d2a17d487c94278 (diff)
downloadmeta-security-9bb7fa51a59fe80080746a763b4f530c4ba29f4e.tar.gz
libseccomp: upgrade 2.5.0 -> 2.5.1
drop patch merged in update
Diffstat (limited to 'recipes-security')
-rw-r--r--recipes-security/libseccomp/files/fix-mips-build-failure.patch49
-rw-r--r--recipes-security/libseccomp/libseccomp_2.5.1.bb (renamed from recipes-security/libseccomp/libseccomp_2.5.0.bb)5
2 files changed, 2 insertions, 52 deletions
diff --git a/recipes-security/libseccomp/files/fix-mips-build-failure.patch b/recipes-security/libseccomp/files/fix-mips-build-failure.patch
deleted file mode 100644
index 7d17a03..0000000
--- a/recipes-security/libseccomp/files/fix-mips-build-failure.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1Backport patch to fix cross compile error for mips:
2
3| syscalls.h:44:6: error: expected identifier or '(' before numeric constant
4| 44 | int mips;
5| | ^~~~
6
7Upstream-Status: Submitted [https://github.com/seccomp/libseccomp/pull/279/commits/04c519e5]
8
9Signed-off-by: Kai Kang <kai.kang@windriver.com>
10
11From 04c519e5b1de53592e98307813e5c6db7418f91b Mon Sep 17 00:00:00 2001
12From: Paul Moore <paul@paul-moore.com>
13Date: Sun, 2 Aug 2020 09:57:39 -0400
14Subject: [PATCH] build: undefine "mips" to prevent build problems for MIPS
15 targets
16
17It turns out that the MIPS GCC compiler defines a "mips" cpp macro
18which was resulting in build failures on MIPS so we need to
19undefine the "mips" macro during build. As this should be safe
20to do in all architectures, just add it to the compiler flags by
21default.
22
23This was reported in the following GH issue:
24* https://github.com/seccomp/libseccomp/issues/274
25
26Reported-by: Rongwei Zhang <pudh4418@gmail.com>
27Suggested-by: Rongwei Zhang <pudh4418@gmail.com>
28Signed-off-by: Paul Moore <paul@paul-moore.com>
29---
30 configure.ac | 4 +++-
31 1 file changed, 3 insertions(+), 1 deletion(-)
32
33diff --git a/configure.ac b/configure.ac
34index 40d9dcbb..3e877348 100644
35--- a/configure.ac
36+++ b/configure.ac
37@@ -65,9 +65,11 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
38
39 dnl ####
40 dnl build flags
41+dnl NOTE: the '-Umips' is here because MIPS GCC compilers "helpfully" define it
42+dnl for us which wreaks havoc on the build
43 dnl ####
44 AM_CPPFLAGS="-I\${top_srcdir}/include -I\${top_builddir}/include"
45-AM_CFLAGS="-Wall"
46+AM_CFLAGS="-Wall -Umips"
47 AM_LDFLAGS="-Wl,-z -Wl,relro"
48 AC_SUBST([AM_CPPFLAGS])
49 AC_SUBST([AM_CFLAGS])
diff --git a/recipes-security/libseccomp/libseccomp_2.5.0.bb b/recipes-security/libseccomp/libseccomp_2.5.1.bb
index 0cf2d70..40ac1a8 100644
--- a/recipes-security/libseccomp/libseccomp_2.5.0.bb
+++ b/recipes-security/libseccomp/libseccomp_2.5.1.bb
@@ -6,12 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357c
6 6
7DEPENDS += "gperf-native" 7DEPENDS += "gperf-native"
8 8
9SRCREV = "f13f58efc690493fe7aa69f54cb52a118f3769c1" 9SRCREV = "4bf70431a339a2886ab8c82e9a45378f30c6e6c7"
10 10
11SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.5 \ 11SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.5 \
12 file://run-ptest \ 12 file://run-ptest \
13 file://fix-mips-build-failure.patch \ 13 "
14"
15 14
16COMPATIBLE_HOST_riscv32 = "null" 15COMPATIBLE_HOST_riscv32 = "null"
17 16