summaryrefslogtreecommitdiffstats
path: root/common/recipes-bsp/gummiboot/files/0002-configure.ac-Use-AC_CHECK_HEADER-to-detect-the-efi-i.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-bsp/gummiboot/files/0002-configure.ac-Use-AC_CHECK_HEADER-to-detect-the-efi-i.patch')
-rw-r--r--common/recipes-bsp/gummiboot/files/0002-configure.ac-Use-AC_CHECK_HEADER-to-detect-the-efi-i.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/common/recipes-bsp/gummiboot/files/0002-configure.ac-Use-AC_CHECK_HEADER-to-detect-the-efi-i.patch b/common/recipes-bsp/gummiboot/files/0002-configure.ac-Use-AC_CHECK_HEADER-to-detect-the-efi-i.patch
new file mode 100644
index 0000000..478eab8
--- /dev/null
+++ b/common/recipes-bsp/gummiboot/files/0002-configure.ac-Use-AC_CHECK_HEADER-to-detect-the-efi-i.patch
@@ -0,0 +1,48 @@
1From b4ad8b65a79e2cf8857439271c88bd44f5e9cd05 Mon Sep 17 00:00:00 2001
2Message-Id: <b4ad8b65a79e2cf8857439271c88bd44f5e9cd05.1367382591.git.dvhart@linux.intel.com>
3In-Reply-To: <c72599a7bd46c22d296c59dbd13f138503350d2f.1367382591.git.dvhart@linux.intel.com>
4References: <c72599a7bd46c22d296c59dbd13f138503350d2f.1367382591.git.dvhart@linux.intel.com>
5From: Darren Hart <dvhart@linux.intel.com>
6Date: Tue, 30 Apr 2013 21:13:39 -0700
7Subject: [PATCH 2/4] configure.ac: Use AC_CHECK_HEADER to detect the efi
8 includes
9
10While cross-compiling, AC_CHECK_FILE will abort the configure.
11
12The gnu-efi sources don't use relative paths and require the user to
13explicitly include -I/usr/include/efi/${ARCH}. I haven't found a way to
14do this with AC_CHECK_HEADER. However, since the existing test was not
15testing for usability (conftest.c compilation), we don't lose much by
16just not looking for efi.h and assume it exists if we can find and use
17efibind.h.
18
19Signed-off-by: Darren Hart <dvhart@linux.intel.com>
20---
21 configure.ac | 11 ++++++-----
22 1 files changed, 6 insertions(+), 5 deletions(-)
23
24diff --git a/configure.ac b/configure.ac
25index 524060c..f7c62ea 100644
26--- a/configure.ac
27+++ b/configure.ac
28@@ -75,11 +75,12 @@ fi
29 AM_CONDITIONAL(ENABLE_BIOSTEST, [test "x$enable_biostest" = "xyes"])
30
31 # ------------------------------------------------------------------------------
32-dnl Compile EFI stuff is so tricky that it's probably better to check for the
33-dnl include files that try to use AC_CHECK_HEADERS to compile any conftest.c
34-AC_CHECK_FILES([/usr/include/efi/efi.h
35- /usr/include/efi/${ARCH}/efibind.h], [],
36- [AC_MSG_ERROR([*** GNU Efi headers not found])])
37+dnl GNU EFI doesn't use relative paths: efi.h includes efibind.h which is in
38+dnl ${ARCH} relative to efi.h. I can't find a way to get AC_CHECK_HEADERS to
39+dnl add -I/usr/include/efi/${ARCH} to the conftest.c build. So, just test for
40+dnl efibind.h as the chances of efi.h not existing if it does are very low.
41+AC_CHECK_HEADER(efi/${ARCH}/efibind.h, [],
42+ [AC_MSG_ERROR([*** GNU EFI header efibind.h not found])])
43
44 efiroot=$(echo $(cd /usr/lib/$(gcc -print-multi-os-directory); pwd))
45 GNUEFI_LIBS="-L $efiroot"
46--
471.7.5.4
48