syslinux/trunk/0004-gnu-efi-from-arch.patch

   1 From: Lukas Schwaighofer <lukas@schwaighofer.name>
   2 Date: Tue, 3 Oct 2017 18:29:13 +0200
   3 Subject: Link against gnu-efi from Debian
   4
   5 Adjust EFIINC, LIBDIR and LIBEFI variables in mk/efi.mk to point to the
   6 files installed by Arch's gnu-efi package.
   7
   8 Forwarded: not-needed
   9 ---
  10  mk/efi.mk | 13 ++++++++++---
  11  1 file changed, 10 insertions(+), 3 deletions(-)
  12
  13 diff --git a/mk/efi.mk b/mk/efi.mk
  14 index f097ad2..dc2b708 100644
  15 --- a/mk/efi.mk
  16 +++ b/mk/efi.mk
  17 @@ -8,8 +8,8 @@ core = $(topdir)/core
  18  # gnuefi sets up architecture specifics in ia32 or x86_64 sub directories
  19  # set up the LIBDIR and EFIINC for building for the appropriate architecture
  20  GCCOPT := $(call gcc_ok,-fno-stack-protector,)
  21 -EFIINC = $(objdir)/include/efi
  22 -LIBDIR  = $(objdir)/lib
  23 +EFIINC = /usr/include/efi
  24 +LIBDIR  = /usr/lib
  25
  26  ifeq ($(ARCH),i386)
  27         ARCHOPT = -m32 -march=i386
  28 @@ -44,7 +51,7 @@ SFLAGS     = $(GCCOPT) $(GCCWARN) $(ARCHOPT) \
  29              -nostdinc -iwithprefix include \
  30              -I$(com32)/libutil/include -I$(com32)/include -I$(com32)/include/sys $(GPLINCLUDE)
  31
  32 -LIBEFI = $(objdir)/lib/libefi.a
  33 +LIBEFI = $(LIBDIR)/libefi.a
  34
  35  $(LIBEFI):
  36         @echo Building gnu-efi for $(EFI_SUBARCH)