diff options
Diffstat (limited to 'debian/patches/fix-test-includes.patch')
| -rw-r--r-- | debian/patches/fix-test-includes.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/debian/patches/fix-test-includes.patch b/debian/patches/fix-test-includes.patch index 5c76ba42..5cca825d 100644 --- a/debian/patches/fix-test-includes.patch +++ b/debian/patches/fix-test-includes.patch @@ -1,3 +1,50 @@ +PR submitted at https://github.com/rhboot/shim/pull/466 + +commit 5ebbaf70ab4332d11a4f03f5b178e8055ba8cbce +Author: Steve McIntyre <steve@einval.com> +Date: Thu Apr 28 12:32:18 2022 +0100 + + tests: also look for system headers in multi-arch directories + + On Debian(-derived) systems low-level system headers are under + /usr/include/<multi-arch path>, so look there too. + + Otherwise we see stuff like: + + gcc -O2 -fno-diagnostics-color -ggdb -std=gnu11 -isystem <foo>/shim.git/include/system -I<foo>/shim.git/gnu-efi/inc -I<foo>/shim.git/gnu-efi/inc/ia32 -I<foo>/shim.git/gnu-efi/inc/protocol -Iinclude -iquote . -isystem /usr/include -isystem /usr/lib/gcc/i686-linux-gnu/11/include -mno-mmx -mno-sse -mno-red-zone -nostdinc -maccumulate-outgoing-args -m32 -DMDE_CPU_IA32 -DPAGE_SIZE=4096 -fshort-wchar -fno-builtin -rdynamic -fno-inline -fno-eliminate-unused-debug-types -fno-eliminate-unused-debug-symbols -gpubnames -grecord-gcc-switches -Wall -Wextra -Wno-missing-field-initializers -Wsign-compare -Wno-deprecated-declarations -Wno-unused-but-set-variable -Wno-unused-variable -Wno-pointer-sign -Werror -Werror=nonnull -Werror=nonnull-compare -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI -DPAGE_SIZE=4096 -DSHIM_UNIT_TEST -DDEFAULT_DEBUG_PRINT_STATE=0 -isystem include-fixed -o test-csv csv.c test-csv.c test.c libefi-test.a -lefivar + In file included from /usr/include/bits/errno.h:26, + from /usr/include/errno.h:28, + from /usr/include/efivar/efivar.h:24, + from include/test.h:51, + from shim.h:68, + from csv.c:6: + /usr/include/linux/errno.h:1:10: fatal error: asm/errno.h: No such file or directory + 1 | #include <asm/errno.h> + | ^~~~~~~~~~~~~ + compilation terminated. + In file included from /usr/include/bits/errno.h:26, + from /usr/include/errno.h:28, + from /usr/include/efivar/efivar.h:24, + from include/test.h:51, + from shim.h:68, + from test-csv.c:9: + /usr/include/linux/errno.h:1:10: fatal error: asm/errno.h: No such file or directory + 1 | #include <asm/errno.h> + | ^~~~~~~~~~~~~ + compilation terminated. + In file included from /usr/include/bits/errno.h:26, + from /usr/include/errno.h:28, + from /usr/include/efivar/efivar.h:24, + from include/test.h:51, + from shim.h:68, + from test.c:7: + /usr/include/linux/errno.h:1:10: fatal error: asm/errno.h: No such file or directory + 1 | #include <asm/errno.h> + | ^~~~~~~~~~~~~ + compilation terminated. + + Signed-off-by: Steve McIntyre <steve@einval.com> + diff --git a/include/test.mk b/include/test.mk index 1a4fc220..e965c600 100644 --- a/include/test.mk |