From 8a6b3be298e32232dd761d2a67066f155356a4332fb2cb5c566d7bffc0b4c853 Mon Sep 17 00:00:00 2001
From: James Fehlig <jfehlig@suse.com>
Date: Tue, 25 Jun 2019 14:44:52 +0000
Subject: [PATCH] Accepting request 711807 from
 home:marxin:branches:Virtualization

- Add sanlock-lto-disable-fpie.patch in order to handle
  boo#1138836. Extra -fPIE is stripped.

OBS-URL: https://build.opensuse.org/request/show/711807
OBS-URL: https://build.opensuse.org/package/show/Virtualization/sanlock?expand=0&rev=55
---
 sanlock-lto-disable-fpie.patch | 16 ++++++++++++++++
 sanlock.changes                |  5 +++++
 sanlock.spec                   |  2 ++
 3 files changed, 23 insertions(+)
 create mode 100644 sanlock-lto-disable-fpie.patch

diff --git a/sanlock-lto-disable-fpie.patch b/sanlock-lto-disable-fpie.patch
new file mode 100644
index 0000000..7792450
--- /dev/null
+++ b/sanlock-lto-disable-fpie.patch
@@ -0,0 +1,16 @@
+Do not mix -fPIC and -FPIE, it is causing issue in LTO mode
+(boo#1138836).
+
+diff --git a/python/setup.py b/python/setup.py
+index 91311a8..91b8b2f 100644
+--- a/python/setup.py
++++ b/python/setup.py
+@@ -11,7 +11,7 @@ sanlock = Extension(name='sanlock',
+                     sources=['sanlock.c'],
+                     include_dirs=['../src'],
+                     library_dirs=['../src'],
+-                    extra_link_args=['-fPIE', '-Wl,-z,relro,-z,now'],
++                    extra_link_args=['-Wl,-z,relro,-z,now'],
+                     libraries=sanlocklib)
+ 
+ version = None
diff --git a/sanlock.changes b/sanlock.changes
index e3789fd..3efd626 100644
--- a/sanlock.changes
+++ b/sanlock.changes
@@ -1,3 +1,8 @@
+Mon Jun 24 14:49:15 UTC 2019 - Martin Liška <mliska@suse.cz>
+
+- Add sanlock-lto-disable-fpie.patch in order to handle
+  boo#1138836. Extra -fPIE is stripped.
+
 -------------------------------------------------------------------
 Mon Jun 17 21:45:36 UTC 2019 - Jim Fehlig <jfehlig@suse.com>
 
diff --git a/sanlock.spec b/sanlock.spec
index 91e3f3e..9737219 100644
--- a/sanlock.spec
+++ b/sanlock.spec
@@ -44,6 +44,7 @@ Patch100:       sanlock-SCHED_RESET_ON_FORK-undefined.patch
 Patch101:       sanlock-python-prefix.patch
 Patch102:       suse-systemd.patch
 Patch103:       suse-no-date-time.patch
+Patch104:       sanlock-lto-disable-fpie.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  libaio-devel
 BuildRequires:  pkgconfig
@@ -129,6 +130,7 @@ common sanlock lockspace.
 %patch101
 %patch102 -p1
 %patch103 -p1
+%patch104 -p1
 
 %build
 # upstream does not require configure