On 8/2/20 11:21 PM, kai wrote: > From: Kai Kang <[email protected]> > > Backport patch to fix cross compile error for mips: > > | syscalls.h:44:6: error: expected identifier or '(' before numeric constant > | 44 | int mips; > | | ^~~~
Merged. thanks > > Signed-off-by: Kai Kang <[email protected]> > --- > .../files/fix-mips-build-failure.patch | 49 +++++++++++++++++++ > .../libseccomp/libseccomp_2.5.0.bb | 1 + > 2 files changed, 50 insertions(+) > create mode 100644 > recipes-security/libseccomp/files/fix-mips-build-failure.patch > > diff --git a/recipes-security/libseccomp/files/fix-mips-build-failure.patch > b/recipes-security/libseccomp/files/fix-mips-build-failure.patch > new file mode 100644 > index 0000000..7d17a03 > --- /dev/null > +++ b/recipes-security/libseccomp/files/fix-mips-build-failure.patch > @@ -0,0 +1,49 @@ > +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 <[email protected]> > + > +From 04c519e5b1de53592e98307813e5c6db7418f91b Mon Sep 17 00:00:00 2001 > +From: Paul Moore <[email protected]> > +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 <[email protected]> > +Suggested-by: Rongwei Zhang <[email protected]> > +Signed-off-by: Paul Moore <[email protected]> > +--- > + 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]) > diff --git a/recipes-security/libseccomp/libseccomp_2.5.0.bb > b/recipes-security/libseccomp/libseccomp_2.5.0.bb > index 7a6b483..35365d5 100644 > --- a/recipes-security/libseccomp/libseccomp_2.5.0.bb > +++ b/recipes-security/libseccomp/libseccomp_2.5.0.bb > @@ -10,6 +10,7 @@ SRCREV = "f13f58efc690493fe7aa69f54cb52a118f3769c1" > > SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.5 \ > file://run-ptest \ > + file://fix-mips-build-failure.patch \ > " > > COMPATIBLE_HOST_riscv32 = "null" > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#50409): https://lists.yoctoproject.org/g/yocto/message/50409 Mute This Topic: https://lists.yoctoproject.org/mt/75960564/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
