0004-gnu-efi-from-arch.patch 1.1 KB

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