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>
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From ee1d78a67b2fc57d87a3d85796497624f275ff8d Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Fri, 25 Oct 2019 15:42:10 -0400
|
|
Subject: [PATCH 37/46] Install all headers for all arches.
|
|
|
|
This further enables cross-builds by installing all the arches headers.
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
inc/Makefile | 17 ++++++++++-------
|
|
1 file changed, 10 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/inc/Makefile b/inc/Makefile
|
|
index 445d340f0fa..e8123fd3115 100644
|
|
--- a/inc/Makefile
|
|
+++ b/inc/Makefile
|
|
@@ -9,15 +9,18 @@ all:
|
|
|
|
clean:
|
|
|
|
+SOURCE=$(realpath $(SRCDIR))
|
|
+DEST=$(INSTALLROOT)$(PREFIX)/include/efi
|
|
+INCLUDEDIRS=$(sort $(shell find $(SOURCE) -type d))
|
|
+
|
|
install:
|
|
- mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi
|
|
- mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol
|
|
- mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
|
|
- $(INSTALL) -m 644 $(SRCDIR)/*.h $(INSTALLROOT)$(PREFIX)/include/efi
|
|
- $(INSTALL) -m 644 $(SRCDIR)/protocol/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol
|
|
- $(INSTALL) -m 644 $(SRCDIR)/$(ARCH)/*.h $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
|
|
+ @$(foreach d,$(INCLUDEDIRS), \
|
|
+ $(INSTALL) -v -m 755 -d $(subst $(SOURCE),$(DEST),$(d)); \
|
|
+ $(INSTALL) -v -m 644 -t $(subst $(SOURCE),$(DEST),$(d)) $(wildcard $(d)/*.h); \
|
|
+ )
|
|
|
|
install_compat: install
|
|
- @if [ ! -h $(DEST)/$(BFD_ARCH) ]; then $(SYMLINK) $(ARCH) $(INSTALLROOT)$(PREFIX)/include/efi/$(BFD_ARCH) ; fi
|
|
+ @if [ ! -h $(DEST)/x86_64 ]; then $(SYMLINK) x64/ $(DEST)/x86_64 ; fi
|
|
+ @if [ ! -h $(DEST)/aarch64 ]; then $(SYMLINK) aa64/ $(DEST)/aarch64 ; fi
|
|
|
|
include $(SRCDIR)/../Make.rules
|
|
--
|
|
2.24.1
|
|
|