90e6999a07
- Update to the stuff in master to fix the issue at: https://bodhi.fedoraproject.org/updates/FEDORA-2020-050993b283#comment-1208958 - Update to 3.0.11 (via patches generated from git) - Plus newer upstream fixes (also via patches generated from git) - Fix shell exit failures in make - Fix .reloc section generation - Fix CHAR8 definition - Fix "make DESTDIR=..." - Change the installed .a/.o layout - Provide makefiles for consumers to use. - Make the -devel noarch since it's just headers. - Add a bunch of compatibility symlinks for our older packages. These will go away once we've migrated everything using them in fedora to use the newer make system... Signed-off-by: Peter Jones <pjones@redhat.com>
34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
From 8858302ab24885e96e4094cbd604e8781a7a4bf3 Mon Sep 17 00:00:00 2001
|
|
From: Soop <sebastian_osorio@outlook.cl>
|
|
Date: Wed, 16 Dec 2015 22:33:33 -0300
|
|
Subject: [PATCH 20/46] Make apps link against the local gnuefi and crt objects
|
|
|
|
---
|
|
apps/Makefile | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/apps/Makefile b/apps/Makefile
|
|
index 4e1b69a38c8..310c6fdb5fc 100644
|
|
--- a/apps/Makefile
|
|
+++ b/apps/Makefile
|
|
@@ -45,14 +45,14 @@ TOPDIR = $(SRCDIR)/..
|
|
CDIR=$(TOPDIR)/..
|
|
LINUX_HEADERS = /usr/src/sys/build
|
|
CPPFLAGS += -D__KERNEL__ -I$(LINUX_HEADERS)/include
|
|
-CRTOBJS = ../gnuefi/crt0-efi-$(ARCH).o
|
|
+CRTOBJS = $(TOPDIR)/$(ARCH)/gnuefi/crt0-efi-$(ARCH).o
|
|
|
|
LDSCRIPT = $(TOPDIR)/gnuefi/elf_$(ARCH)_efi.lds
|
|
ifneq (,$(findstring FreeBSD,$(OS)))
|
|
LDSCRIPT = $(TOPDIR)/gnuefi/elf_$(ARCH)_fbsd_efi.lds
|
|
endif
|
|
|
|
-LDFLAGS += -shared -Bsymbolic -L../lib -L../gnuefi $(CRTOBJS)
|
|
+LDFLAGS += -shared -Bsymbolic -L$(TOPDIR)/$(ARCH)/lib -L$(TOPDIR)/$(ARCH)/gnuefi $(CRTOBJS)
|
|
|
|
LOADLIBES += -lefi -lgnuefi
|
|
LOADLIBES += $(LIBGCC)
|
|
--
|
|
2.24.1
|
|
|