summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYixun Lan <dlan@gentoo.org>2014-03-25 05:18:32 +0000
committerYixun Lan <dlan@gentoo.org>2014-03-25 05:18:32 +0000
commit62de239a4c3bac41696c7164ffbdaea30e5cd6f2 (patch)
tree6d034cb3c9d7243ad6dd9642c7ccd2b40d6df1a7 /app-emulation
parentAdd PYTHON_REQ_USE, fixes Bug #501558 by M. Johnson, rm old (diff)
downloadgentoo-2-62de239a4c3bac41696c7164ffbdaea30e5cd6f2.tar.gz
gentoo-2-62de239a4c3bac41696c7164ffbdaea30e5cd6f2.tar.bz2
gentoo-2-62de239a4c3bac41696c7164ffbdaea30e5cd6f2.zip
amend efi patch, fix build err, thanks @mva
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/xen/files/xen-4.4-efi.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/app-emulation/xen/files/xen-4.4-efi.patch b/app-emulation/xen/files/xen-4.4-efi.patch
index 9213ade77da2..c584d141d4f2 100644
--- a/app-emulation/xen/files/xen-4.4-efi.patch
+++ b/app-emulation/xen/files/xen-4.4-efi.patch
@@ -21,3 +21,16 @@ index 39839a3..d2603f0 100644
$(INSTALL_DATA) $(TARGET)-syms $(D)/boot/$(T)-syms-$(XEN_FULLVERSION)
if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \
[ -d $(D)$(EFI_DIR) ] || $(INSTALL_DIR) $(D)$(EFI_DIR); \
+diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
+index d502bdf..a2121b0 100644
+--- a/xen/arch/x86/Makefile
++++ b/xen/arch/x86/Makefile
+@@ -112,7 +112,7 @@ $(TARGET)-syms: prelink.o xen.lds $(BASEDIR)/common/symbols-dummy.o
+ $(@D)/.$(@F).1.o -o $@
+ rm -f $(@D)/.$(@F).[0-9]*
+
+-EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
++EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
+ EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug
+ EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20
+ EFI_LDFLAGS += --major-image-version=$(XEN_VERSION)