Accepting request 312218 from home:gary_lin:branches:Base:System

adjust the linker order which caused the compilation error in pesign

OBS-URL: https://build.opensuse.org/request/show/312218
OBS-URL: https://build.opensuse.org/package/show/Base:System/efivar?expand=0&rev=6

efivar-revert-linker-order.patch

@@ -0,0 +1,37 @@
+From 1335ffbe3c83dacbadce38b19b07aaaf3406a1f5 Mon Sep 17 00:00:00 2001
+From: Gary Ching-Pang Lin <chingpang@gmail.com>
+Date: Tue, 16 Jun 2015 15:28:54 +0800
+Subject: [PATCH] Revert "Adjust linker order for pkg-config to fix FTBFS on
+ Ubuntu toolchain."
+
+This reverts commit 624237e6d5c8b84cbf7aeaf8d43b5d38f63da66d.
+---
+ src/efiboot.pc.in | 2 +-
+ src/efivar.pc.in  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/efiboot.pc.in b/src/efiboot.pc.in
+index 6e51346..a5776d5 100644
+--- a/src/efiboot.pc.in
++++ b/src/efiboot.pc.in
+@@ -7,5 +7,5 @@ Name: efiboot
+ Description: UEFI Boot variable support
+ Version: @@VERSION@@
+ Requires:
+-Libs: -L${libdir} -ldl -lefivar -lefiboot
++Libs: -L${libdir} -lefivar -lefiboot -ldl
+ Cflags: -I${includedir}/efivar
+diff --git a/src/efivar.pc.in b/src/efivar.pc.in
+index 0cb3c23..6bbdaf9 100644
+--- a/src/efivar.pc.in
++++ b/src/efivar.pc.in
+@@ -7,5 +7,5 @@ Name: efivar
+ Description: UEFI Variable Management
+ Version: @@VERSION@@
+ Requires:
+-Libs: -L${libdir} -ldl -lefivar
++Libs: -L${libdir} -lefivar -ldl
+ Cflags: -I${includedir}/efivar
+-- 
+2.1.4
+

efivar.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 16 07:30:20 UTC 2015 - glin@suse.com
+
+- Add efivar-revert-linker-order.spec to adjust the linker order
+  which caused the compilation error in pesign
+
 -------------------------------------------------------------------
 Thu Jun 11 06:59:41 UTC 2015 - mpluskal@suse.com
 

efivar.spec

@@ -24,6 +24,7 @@ License:        LGPL-2.1
 Group:          Development/Libraries/Other
 Url:            https://github.com/vathpela/efivar
 Source0:        https://github.com/vathpela/efivar/releases/download/%{version}/%{name}-%{version}.tar.bz2
+Patch1:         efivar-revert-linker-order.patch
 BuildRequires:  fdupes
 BuildRequires:  pkg-config
 BuildRequires:  popt-devel
@@ -49,6 +50,7 @@ development headers required to use libefivar.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 export CFLAGS="%{optflags}"