From: Paul Moore Date: Sun, 2 Aug 2020 13:57:39 +0000 (-0400) Subject: [PATCH] build: undefine "mips" to prevent build problems for MIPS targets X-Git-Tag: archive/raspbian/2.5.0-3+rpi1^2~3 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=79b66bf6c67f82fd12c893c4c146473821db2f93;p=libseccomp.git [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 Suggested-by: Rongwei Zhang Acked-by: Tom Hromatka Signed-off-by: Paul Moore (imported from commit 5cd9059618a0810ee47c21e6b44c5a876b75e23d) Gbp-Pq: Name build_undefine_mips_to_prevent_build_problems.patch --- diff --git a/configure.ac b/configure.ac index d47c25c..7b91c7a 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/src/Makefile.am b/src/Makefile.am index 8d8b97f..10154e1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -61,7 +61,7 @@ lib_LTLIBRARIES = libseccomp.la arch_syscall_dump_SOURCES = arch-syscall-dump.c ${SOURCES_ALL} arch_syscall_check_SOURCES = arch-syscall-check.c ${SOURCES_ALL} -arch_syscall_check_CFLAGS = ${CODE_COVERAGE_CFLAGS} +arch_syscall_check_CFLAGS = ${AM_CFLAGS} ${CODE_COVERAGE_CFLAGS} arch_syscall_check_LDFLAGS = ${CODE_COVERAGE_LDFLAGS} libseccomp_la_SOURCES = ${SOURCES_ALL}