SLFO-pool/efivar
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main efivar revision 371cba619f1515e35e4b24e31d90f131

Browse Source
This commit is contained in:
Adrian Schröter 2024-12-04 09:20:09 +01:00
parent 4951bfc643
commit 2332664533
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
efivar-filter-gcc-march.patch
View File

@ -1,12 +1,15 @@
From 85419ca09d225630cd1740e554bfb65c560e3904 Mon Sep 17 00:00:00 2001 From 85419ca09d225630cd1740e554bfb65c560e3904 Mon Sep 17 00:00:00 2001
From: Gary Lin <glin@suse.com> From: Gary Lin <glin@suse.com>
Date: Wed, 21 Dec 2022 14:49:34 +0800 Date: Wed, 21 Dec 2022 14:49:34 +0800
Subject: [PATCH] Exclude '-march=native' from ppc64le and riscv64 Date: Tue, 08 Oct 2024 04:18:22 +0800
Subject: [PATCH] Exclude '-march=native' from all archs
Since gcc of ppc64le and riscv64 doesn't support '-march=native', remove Since we do not want our build results to depend on the build machine's CPU,
it from HOST_CPPFLAGS. remove it from HOST_CPPFLAGS.
fixes https://bugzilla.opensuse.org/show_bug.cgi?id=1231368
Signed-off-by: Gary Lin <glin@suse.com> Signed-off-by: Gary Lin <glin@suse.com>
Signed-off-by: Bernhard M. Wiedemann <bwiedemann suse.com>
--- ---
src/include/defaults.mk | 2 +- src/include/defaults.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
@ -20,7 +23,7 @@ index 9da5182..94502ed 100644
HOST_ARCH=$(shell uname -m) HOST_ARCH=$(shell uname -m)
-ifneq ($(HOST_ARCH),ia64) -ifneq ($(HOST_ARCH),ia64)
+ifeq (, $(filter ia64 riscv64 ppc64le, $(HOST_ARCH))) +ifeq (0,1)
HOST_MARCH=-march=native HOST_MARCH=-march=native
else else
HOST_MARCH= HOST_MARCH=

11
efivar.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Oct 8 02:18:42 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com>
- Adapt efivar-filter-gcc-march.patch to drop -march=native (boo#1231368)
-------------------------------------------------------------------
Wed Oct 11 16:37:24 UTC 2023 - Matej Cepl <mcepl@cepl.eu>
- We don’t mandoc at all after all (gh#rhboot/efivar#229 and
gh#rhboot/efivar#253).
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 10 07:21:31 UTC 2023 - Gary Ching-Pang Lin <glin@suse.com> Fri Feb 10 07:21:31 UTC 2023 - Gary Ching-Pang Lin <glin@suse.com>

4
efivar.spec
View File

@ -31,7 +31,6 @@ Patch2: efivar-adjust-dependency.patch
Patch3: efivar-filter-gcc-march.patch Patch3: efivar-filter-gcc-march.patch
Patch4: efivar-bsc1206388-revamp-efi_well_known-variable-handling.patch Patch4: efivar-bsc1206388-revamp-efi_well_known-variable-handling.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: mandoc
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: pkgconfig(popt) BuildRequires: pkgconfig(popt)
Requires: libefivar%{major} = %{version}-%{release} Requires: libefivar%{major} = %{version}-%{release}
@ -57,6 +56,9 @@ Development headers required to use libefivar.
%prep %prep
%autosetup -p1 %autosetup -p1
# Avoid rebuilding gh#rhboot/efivar#229 and gh#rhboot/efivar#253
mv -v docs/efisecdb.1{.mdoc,}
%build %build
CFLAGS="%{optflags} -Wno-nonnull -flto" CFLAGS="%{optflags} -Wno-nonnull -flto"
%ifarch ia64 %ifarch ia64