From: Jan Palus Date: Wed, 10 Jun 2020 11:21:36 +0000 (+0200) Subject: fix build with gcc 10; rel 4 X-Git-Tag: auto/th/systemd-244-4 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=6340d12dafbf5687dbc6fdffd19196d3350637d1;p=packages%2Fsystemd.git fix build with gcc 10; rel 4 --- diff --git a/gcc10.patch b/gcc10.patch new file mode 100644 index 0000000..d211515 --- /dev/null +++ b/gcc10.patch @@ -0,0 +1,40 @@ +From 8bdda551dab5579a14db1d66f34356d45d5cda16 Mon Sep 17 00:00:00 2001 +From: Susant Sahani +Date: Sat, 25 Jan 2020 11:30:08 +0100 +Subject: [PATCH] efi: fix build. + +``` +ninja -C build +ninja: Entering directory `build' +[29/101] Generating systemd_boot.so with a custom command. +FAILED: src/boot/efi/systemd_boot.so +/usr/bin/ld -o src/boot/efi/systemd_boot.so -T /usr/lib64/gnuefi/elf_x64_efi.lds -shared -Bsymbolic -nostdlib -znocombreloc -L /usr/lib64 /usr/lib64/gnuefi/crt0-efi-x64.o src/boot/efi/disk.c.o src/boot/efi/graphics.c.o src/boot/efi/measure.c.o src/boot/efi/pe.c.o src/boot/efi/util.c.o src/boot/efi/boot.c.o src/boot/efi/console.c.o src/boot/efi/crc32.c.o src/boot/efi/random-seed.c.o src/boot/efi/sha256.c.o src/boot/efi/shim.c.o -lefi -lgnuefi /usr/lib/gcc/x86_64-redhat-linux/10/libgcc.a +/usr/bin/ld: src/boot/efi/graphics.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here +/usr/bin/ld: src/boot/efi/pe.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here +/usr/bin/ld: src/boot/efi/util.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here +/usr/bin/ld: src/boot/efi/boot.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here +/usr/bin/ld: src/boot/efi/console.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here +/usr/bin/ld: src/boot/efi/random-seed.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here +/usr/bin/ld: src/boot/efi/shim.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here +[31/101] Generating stub.c.o with a custom command. +ninja: build stopped: subcommand failed. +make: *** [Makefile:2: all] Error 1 + +``` +--- + src/boot/efi/util.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/boot/efi/util.h b/src/boot/efi/util.h +index 8518dfde77e..b13f22476c6 100644 +--- a/src/boot/efi/util.h ++++ b/src/boot/efi/util.h +@@ -55,7 +55,7 @@ static inline void FileHandleClosep(EFI_FILE_HANDLE *handle) { + uefi_call_wrapper((*handle)->Close, 1, *handle); + } + +-const EFI_GUID loader_guid; ++extern const EFI_GUID loader_guid; + + #define UINTN_MAX (~(UINTN)0) + #define INTN_MAX ((INTN)(UINTN_MAX>>1)) diff --git a/systemd.spec b/systemd.spec index 5181c62..8f0dc5a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -29,7 +29,7 @@ Summary(pl.UTF-8): systemd - zarządca systemu i usług dla Linuksa Name: systemd # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often) Version: 244 -Release: 3 +Release: 4 Epoch: 1 License: GPL v2+ (udev), LGPL v2.1+ (the rest) Group: Base @@ -77,6 +77,7 @@ Patch12: uids_gids.patch Patch13: sysctl.patch Patch14: pld-pam-%{name}-user.patch Patch15: %{name}-x32.patch +Patch16: gcc10.patch URL: https://www.freedesktop.org/wiki/Software/systemd/ BuildRequires: acl-devel %{?with_audit:BuildRequires: audit-libs-devel} @@ -673,6 +674,7 @@ Uzupełnianie parametrów w zsh dla poleceń udev. %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 cp -p %{SOURCE2} src/systemd_booted.c