From 012052d45a471eb46995b5bf17b0b4525e9bbd5fa7495e0ee5bb738cb1456c85 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <sbrabec@suse.com>
Date: Fri, 5 May 2017 16:48:47 +0000
Subject: [PATCH] Accepting request 484272 from home:msmeissn:branches:hardware

- no-pie.patch: build msrtool without PIE/PIC

OBS-URL: https://build.opensuse.org/request/show/484272
OBS-URL: https://build.opensuse.org/package/show/hardware/coreboot-utils?expand=0&rev=24
---
 coreboot-utils.changes |  5 +++++
 coreboot-utils.spec    |  2 ++
 no-pie.patch           | 15 +++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 no-pie.patch

diff --git a/coreboot-utils.changes b/coreboot-utils.changes
index ef6fb25..200f193 100644
--- a/coreboot-utils.changes
+++ b/coreboot-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar 31 21:22:59 UTC 2017 - meissner@suse.com
+
+- no-pie.patch: build msrtool without PIE/PIC
+
 -------------------------------------------------------------------
 Sat Feb 25 21:03:17 UTC 2017 - shshyukriev@suse.com
 
diff --git a/coreboot-utils.spec b/coreboot-utils.spec
index 9b5bea0..49a908b 100644
--- a/coreboot-utils.spec
+++ b/coreboot-utils.spec
@@ -24,6 +24,7 @@ Group:          Development/Tools/Other
 Version:        4.5
 Release:        0
 Source0:        http://www.coreboot.org/releases/coreboot-%{version}.tar.xz
+Patch1:         no-pie.patch
 Patch2:         k8resdump.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++
@@ -39,6 +40,7 @@ used to develop and configure systems with coreboot.
 
 %prep
 %setup -q -n coreboot-%{version}
+%patch1 -p1
 %patch2 -p1
 
 %build
diff --git a/no-pie.patch b/no-pie.patch
new file mode 100644
index 0000000..4c74197
--- /dev/null
+++ b/no-pie.patch
@@ -0,0 +1,15 @@
+Index: coreboot-4.5/util/msrtool/Makefile.in
+===================================================================
+--- coreboot-4.5.orig/util/msrtool/Makefile.in
++++ coreboot-4.5/util/msrtool/Makefile.in
+@@ -19,8 +19,8 @@ PROGRAM = msrtool
+ CC      = @CC@
+ INSTALL = @INSTALL@
+ PREFIX  = @PREFIX@
+-CFLAGS  = @CFLAGS@ -fno-pic
+-LDFLAGS = @LDFLAGS@
++CFLAGS  = @CFLAGS@ -fno-pic -fno-PIE
++LDFLAGS = @LDFLAGS@ -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
+ SYSTEMS = linux.o darwin.o freebsd.o