mirror of
https://git.yoctoproject.org/meta-security
synced 2026-05-31 12:50:19 +00:00
libseccomp: upgrade 2.5.0 -> 2.5.1
drop patch merged in update
This commit is contained in:
@@ -1,49 +0,0 @@
|
|||||||
Backport patch to fix cross compile error for mips:
|
|
||||||
|
|
||||||
| syscalls.h:44:6: error: expected identifier or '(' before numeric constant
|
|
||||||
| 44 | int mips;
|
|
||||||
| | ^~~~
|
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://github.com/seccomp/libseccomp/pull/279/commits/04c519e5]
|
|
||||||
|
|
||||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
|
||||||
|
|
||||||
From 04c519e5b1de53592e98307813e5c6db7418f91b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Paul Moore <paul@paul-moore.com>
|
|
||||||
Date: Sun, 2 Aug 2020 09:57:39 -0400
|
|
||||||
Subject: [PATCH] build: undefine "mips" to prevent build problems for MIPS
|
|
||||||
targets
|
|
||||||
|
|
||||||
It turns out that the MIPS GCC compiler defines a "mips" cpp macro
|
|
||||||
which was resulting in build failures on MIPS so we need to
|
|
||||||
undefine the "mips" macro during build. As this should be safe
|
|
||||||
to do in all architectures, just add it to the compiler flags by
|
|
||||||
default.
|
|
||||||
|
|
||||||
This was reported in the following GH issue:
|
|
||||||
* https://github.com/seccomp/libseccomp/issues/274
|
|
||||||
|
|
||||||
Reported-by: Rongwei Zhang <pudh4418@gmail.com>
|
|
||||||
Suggested-by: Rongwei Zhang <pudh4418@gmail.com>
|
|
||||||
Signed-off-by: Paul Moore <paul@paul-moore.com>
|
|
||||||
---
|
|
||||||
configure.ac | 4 +++-
|
|
||||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 40d9dcbb..3e877348 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -65,9 +65,11 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
|
||||||
|
|
||||||
dnl ####
|
|
||||||
dnl build flags
|
|
||||||
+dnl NOTE: the '-Umips' is here because MIPS GCC compilers "helpfully" define it
|
|
||||||
+dnl for us which wreaks havoc on the build
|
|
||||||
dnl ####
|
|
||||||
AM_CPPFLAGS="-I\${top_srcdir}/include -I\${top_builddir}/include"
|
|
||||||
-AM_CFLAGS="-Wall"
|
|
||||||
+AM_CFLAGS="-Wall -Umips"
|
|
||||||
AM_LDFLAGS="-Wl,-z -Wl,relro"
|
|
||||||
AC_SUBST([AM_CPPFLAGS])
|
|
||||||
AC_SUBST([AM_CFLAGS])
|
|
||||||
+2
-3
@@ -6,12 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357c
|
|||||||
|
|
||||||
DEPENDS += "gperf-native"
|
DEPENDS += "gperf-native"
|
||||||
|
|
||||||
SRCREV = "f13f58efc690493fe7aa69f54cb52a118f3769c1"
|
SRCREV = "4bf70431a339a2886ab8c82e9a45378f30c6e6c7"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.5 \
|
SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.5 \
|
||||||
file://run-ptest \
|
file://run-ptest \
|
||||||
file://fix-mips-build-failure.patch \
|
"
|
||||||
"
|
|
||||||
|
|
||||||
COMPATIBLE_HOST_riscv32 = "null"
|
COMPATIBLE_HOST_riscv32 = "null"
|
||||||
|
|
||||||
Reference in New Issue
Block a user