Skip to contentSkip to conversation

package/gnu-efi: fix efilink

PATCH Superseded James Hilliard 2 participants 5 messages Oct 25, 2019

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/gnu-efi: fix efilink

Fixes:
In file included from /home/buildroot/buildroot/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/efi/efilib.h:25,

                 from ../src/boot/efi/measure.c:6:
/home/buildroot/buildroot/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/efi/efilink.h:5:10: fatal error: stdint.h: No such file or directory
 #include <stdint.h>
          ^~~~~~~~~~
---
 ...evert-efilink-fix-build-with-gcc-4.8.patch | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 package/gnu-efi/0002-Revert-efilink-fix-build-with-gcc-4.8.patch
package/gnu-efi/0002-Revert-efilink-fix-build-with-gcc-4.8.patch new file +38 -0
new file mode 100644
index 0000000000..5a08c24254
@@ -0,0 +1,38 @@
+From 1f7b2e5bd6603b30202a66b6317a41e2be85742b Mon Sep 17 00:00:00 2001
+From: Esben Haabendal <[email protected]>
+Date: Tue, 26 Mar 2019 13:37:02 +0100
+Subject: [PATCH] Revert "efilink: fix build with gcc 4.8"
+
+This reverts commit 6335e5c697c57d8b5854b8202de3733bcb151ca6, as it breaks
+gcc builds with '-nostdinc' flag.
+
+The fix in 1a53d8f88a452847b25f9689f9a08dbcf82c86e4
+(Fix for problem with undeclared intptr_t type), which is also merged
+fixes the same problem, without causing breakage.
+
+Signed-off-by: Esben Haabendal <[email protected]>
+Signed-off-by: James Hilliard <[email protected]>
+[Upstream status:
+https://sourceforge.net/p/gnu-efi/code/merge-requests/6/]
+---
+ inc/efilink.h | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/inc/efilink.h b/inc/efilink.h
+index b69a6fd..cc5aa2d 100644
+--- a/inc/efilink.h
++++ b/inc/efilink.h
+@@ -1,10 +1,6 @@
+ #ifndef _EFI_LINK_H
+ #define _EFI_LINK_H
+ 
+-#if defined(__GNUC__)
+-#include <stdint.h>
+-#endif
+-
+ /*++
+ 
+ Copyright (c) 1998  Intel Corporation
+-- 
+2.20.1
+
Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 1/1 package/gnu-efi: fix efilink

Quoted 5 lines · On Fri, 25 Oct 2019 11:33:20 -0600 James Hilliard <[email protected]>…

Fixes:
In file included from /home/buildroot/buildroot/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/efi/efilib.h:25,

                 from ../src/boot/efi/measure.c:6:

/home/buildroot/buildroot/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/efi/efilink.h:5:10: fatal error: stdint.h: No such file or directory
#include <stdint.h>

When building what ? Which package, which configuration ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH v2 1/1 package/gnu-efi: fix efilink

Quoted 11 lines · Thomas Petazzoni
Quoted 5 lines · On Fri, 25 Oct 2019 11:33:20 -0600 James Hilliard <[email protected]>…

Fixes:
In file included from /home/buildroot/buildroot/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/efi/efilib.h:25,

                 from ../src/boot/efi/measure.c:6:

/home/buildroot/buildroot/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/efi/efilink.h:5:10: fatal error: stdint.h: No such file or directory
#include <stdint.h>

When building what ? Which package, which configuration ?

The systemd-boot package in this branch but with source overridden to point to a local checkout of https://github.com/systemd/systemd/pull/13842:
https://github.com/jameshilliard/buildroot/tree/systemd-boot
I did make defconfig and selected just the systemd-boot package.

Quoted 6 lines

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

#3 lore raw

PATCH v2 1/1 package/gnu-efi: fix efilink

Quoted 12 lines · On Fri, 25 Oct 2019 19:45:05 +0200 James Hilliard <[email protected]>…
Quoted 10 lines · Thomas Petazzoni
Quoted 5 lines · On Fri, 25 Oct 2019 11:33:20 -0600 James Hilliard <[email protected]>…

Fixes:
In file included from /home/buildroot/buildroot/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/efi/efilib.h:25,

                 from ../src/boot/efi/measure.c:6:

/home/buildroot/buildroot/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/efi/efilink.h:5:10: fatal error: stdint.h: No such file or directory
#include <stdint.h>

Quoted 5 lines
Quoted 1 line

When building what ? Which package, which configuration ?

The systemd-boot package in this branch but with source overridden to point to a local checkout of https://github.com/systemd/systemd/pull/13842:
https://github.com/jameshilliard/buildroot/tree/systemd-boot
I did make defconfig and selected just the systemd-boot package.

Could this be added in the commit log ?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH v2 1/1 package/gnu-efi: fix efilink

Quoted 16 lines · Thomas Petazzoni
Quoted 12 lines · On Fri, 25 Oct 2019 19:45:05 +0200 James Hilliard <[email protected]>…
Quoted 10 lines · Thomas Petazzoni
Quoted 5 lines · On Fri, 25 Oct 2019 11:33:20 -0600 James Hilliard <[email protected]>…

Fixes:
In file included from /home/buildroot/buildroot/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/efi/efilib.h:25,

                 from ../src/boot/efi/measure.c:6:

/home/buildroot/buildroot/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/efi/efilink.h:5:10: fatal error: stdint.h: No such file or directory
#include <stdint.h>

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

When building what ? Which package, which configuration ?

The systemd-boot package in this branch but with source overridden to point to a local checkout of https://github.com/systemd/systemd/pull/13842:
https://github.com/jameshilliard/buildroot/tree/systemd-boot
I did make defconfig and selected just the systemd-boot package.

Could this be added in the commit log ?

I was able to reproduce using the normal systemd-boot build as well. I'll resend with that info.

Quoted 8 lines

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com