upgpkg: ocaml-ctypes 0.20.2-1
[arch-packages.git] / syslinux / trunk / 0005-gnu-efi-version-compatibility.patch
blobf50ad006db2ecac84f6b571a6ef2fc67217f0c6a
1 From: Lukas Schwaighofer <lukas@schwaighofer.name>
2 Date: Mon, 3 Dec 2018 22:45:44 +0100
3 Subject: Fix compatibility with new gnu-efi version
5 Allow multiple definitions when linking the syslinux binary so the
6 memset and memcpy symbols which are included by gnu-efi since 3.0.8 are
7 ignored (we still use the definitions from syslinux) but linking
8 succeeds.
9 ---
10 efi/Makefile | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
13 diff --git a/efi/Makefile b/efi/Makefile
14 index f4501e7..0d1a673 100644
15 --- a/efi/Makefile
16 +++ b/efi/Makefile
17 @@ -71,7 +71,7 @@ $(OBJS): | $(OBJ)/$(ARCH)
18 BTARGET = syslinux.efi
20 syslinux.so: $(OBJS) $(CORE_OBJS) $(LIB_OBJS)
21 - $(LD) $(LDFLAGS) --strip-debug -o $@ $^ -lgnuefi -lefi
22 + $(LD) $(LDFLAGS) -zmuldefs --strip-debug -o $@ $^ -lgnuefi -lefi
24 # We need to rename the .hash section because the EFI firmware
25 # linker really doesn't like it.