1
0

Accepting request 504196 from home:alarrosa:branches:hardware

- Add do-explicit-fallthrough.patch to fix a build failure with gcc7
  with an implicit fallthrough over switch cases (only on TW)
- Add -fPIC to no-pie.patch and remove -fno-pic to build with gcc7

OBS-URL: https://build.opensuse.org/request/show/504196
OBS-URL: https://build.opensuse.org/package/show/hardware/coreboot-utils?expand=0&rev=26
This commit is contained in:
Olaf Hering 2017-06-29 09:17:28 +00:00 committed by Git OBS Bridge
parent 012052d45a
commit d0f499d0d5
4 changed files with 28 additions and 2 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jun 16 12:00:39 UTC 2017 - alarrosa@suse.com
- Add do-explicit-fallthrough.patch to fix a build failure with gcc7
with an implicit fallthrough over switch cases (only on TW)
- Add -fPIC to no-pie.patch and remove -fno-pic to build with gcc7
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 31 21:22:59 UTC 2017 - meissner@suse.com Fri Mar 31 21:22:59 UTC 2017 - meissner@suse.com

View File

@ -26,6 +26,7 @@ Release: 0
Source0: http://www.coreboot.org/releases/coreboot-%{version}.tar.xz Source0: http://www.coreboot.org/releases/coreboot-%{version}.tar.xz
Patch1: no-pie.patch Patch1: no-pie.patch
Patch2: k8resdump.diff Patch2: k8resdump.diff
Patch3: do-explicit-fallthrough.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pciutils-devel BuildRequires: pciutils-devel
@ -40,8 +41,13 @@ used to develop and configure systems with coreboot.
%prep %prep
%setup -q -n coreboot-%{version} %setup -q -n coreboot-%{version}
%if 0%{?suse_version} > 1320
%patch1 -p1 %patch1 -p1
%endif
%patch2 -p1 %patch2 -p1
%if 0%{?suse_version} > 1320
%patch3 -p1
%endif
%build %build
make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/ectool make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/ectool

View File

@ -0,0 +1,13 @@
Index: coreboot-4.5/util/cbfstool/lz4/lib/lz4frame.c
===================================================================
--- coreboot-4.5.orig/util/cbfstool/lz4/lib/lz4frame.c
+++ coreboot-4.5/util/cbfstool/lz4/lib/lz4frame.c
@@ -1091,7 +1091,7 @@ size_t LZ4F_decompress(LZ4F_decompressio
dctxPtr->tmpInTarget = minFHSize; /* minimum to attempt decode */
dctxPtr->dStage = dstage_storeHeader;
}
-
+ __attribute__ ((fallthrough));
case dstage_storeHeader:
{
size_t sizeToCopy = dctxPtr->tmpInTarget - dctxPtr->tmpInSize;

View File

@ -8,8 +8,8 @@ Index: coreboot-4.5/util/msrtool/Makefile.in
PREFIX = @PREFIX@ PREFIX = @PREFIX@
-CFLAGS = @CFLAGS@ -fno-pic -CFLAGS = @CFLAGS@ -fno-pic
-LDFLAGS = @LDFLAGS@ -LDFLAGS = @LDFLAGS@
+CFLAGS = @CFLAGS@ -fno-pic -fno-PIE +CFLAGS = @CFLAGS@ -fPIC -fno-PIE
+LDFLAGS = @LDFLAGS@ -no-pie +LDFLAGS = @LDFLAGS@ -fPIC -no-pie
TARGETS = geodegx2.o geodelx.o cs5536.o k8.o intel_pentium3_early.o intel_pentium3.o intel_pentium4_early.o intel_pentium4_later.o intel_core1.o intel_core2_early.o intel_core2_later.o intel_nehalem.o intel_atom.o TARGETS = geodegx2.o geodelx.o cs5536.o k8.o intel_pentium3_early.o intel_pentium3.o intel_pentium4_early.o intel_pentium4_later.o intel_core1.o intel_core2_early.o intel_core2_later.o intel_nehalem.o intel_atom.o
SYSTEMS = linux.o darwin.o freebsd.o SYSTEMS = linux.o darwin.o freebsd.o