diff options
| author |   Tomáš Mózes <hydrapolic@gmail.com> | 2022-02-19 03:00:26 +0000 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-02-19 03:06:08 +0000 |
| commit | bc032ce580e626d871ca0f919172c6af899180a5 (patch) | |
| tree | fada43915ef976a2066deada3b5cdf72eeba279e /app-emulation/xen | |
| parent | sys-fs/mtools: Stabilize 4.0.37 sparc, #833652 (diff) | |
| download | gentoo-bc032ce580e626d871ca0f919172c6af899180a5.tar.gz gentoo-bc032ce580e626d871ca0f919172c6af899180a5.tar.bz2 gentoo-bc032ce580e626d871ca0f919172c6af899180a5.zip | |
app-emulation/xen: re-add accidentally removed patch
Closes: https://bugs.gentoo.org/833527
Signed-off-by: Tomáš Mózes <hydrapolic@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24267
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-emulation/xen')
| -rw-r--r-- | app-emulation/xen/files/xen-4.16-efi.patch | 12 | ||||
| -rw-r--r-- | app-emulation/xen/xen-4.16.0-r3.ebuild (renamed from app-emulation/xen/xen-4.16.0-r2.ebuild) | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/app-emulation/xen/files/xen-4.16-efi.patch b/app-emulation/xen/files/xen-4.16-efi.patch new file mode 100644 index 000000000000..0de5575fc9e1 --- /dev/null +++ b/app-emulation/xen/files/xen-4.16-efi.patch @@ -0,0 +1,12 @@ +diff -urN a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile +--- a/xen/arch/x86/Makefile 2021-11-30 06:42:42.000000000 -0500 ++++ b/xen/arch/x86/Makefile 2022-02-17 07:43:06.597244620 -0500 +@@ -127,7 +127,7 @@ + CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI + + # Check if the linker supports PE. +-EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10 ++EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10 + XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(call ld-option,$(EFI_LDFLAGS) --image-base=0x100000000 -o efi/check.efi efi/check.o)) + # If the above failed, it may be merely because of the linker not dealing well + # with debug info. Try again with stripping it. diff --git a/app-emulation/xen/xen-4.16.0-r2.ebuild b/app-emulation/xen/xen-4.16.0-r3.ebuild index d42ab1882530..1d8a4d366e2c 100644 --- a/app-emulation/xen/xen-4.16.0-r2.ebuild +++ b/app-emulation/xen/xen-4.16.0-r3.ebuild @@ -93,6 +93,8 @@ src_prepare() { # Gentoo's patchset [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo + eapply "${FILESDIR}"/${PN}-4.16-efi.patch + # Symlinks do not work on fat32 volumes # 829765 if ! use boot-symlinks || use efi; then eapply "${FILESDIR}"/${PN}-4.16-no-symlink.patch |