From 2d76c7d932c148b1f385d4d82d064310513a683d61993ed05049ddb04362ecc6 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 18 Jul 2012 15:47:48 +0000
Subject: [PATCH] - cleaned below up, pass in OPTFLAGS and LIBDIR to make.

OBS-URL: https://build.opensuse.org/package/show/Base:System/gnu-efi?expand=0&rev=7
---
 gnu-efi-add-optflags-to-make-defaults.patch | 12 +++++++-----
 gnu-efi.changes                             |  5 +++++
 gnu-efi.spec                                |  6 ++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/gnu-efi-add-optflags-to-make-defaults.patch b/gnu-efi-add-optflags-to-make-defaults.patch
index ef001b3..acf1291 100644
--- a/gnu-efi-add-optflags-to-make-defaults.patch
+++ b/gnu-efi-add-optflags-to-make-defaults.patch
@@ -1,12 +1,14 @@
-diff -Naur a/Make.defaults b/Make.defaults
---- a/Make.defaults	2012-04-30 10:35:44.000000000 -0500
-+++ b/Make.defaults	2012-07-16 21:39:42.208929565 -0500
-@@ -48,7 +48,7 @@
+Index: gnu-efi-3.0/Make.defaults
+===================================================================
+--- gnu-efi-3.0.orig/Make.defaults
++++ gnu-efi-3.0/Make.defaults
+@@ -48,7 +48,8 @@ ARCH	   := $(shell uname -m | sed s,i[34
  OS	   = $(shell uname -s)
  INCDIR	   = -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) -I$(TOPDIR)/inc/protocol 
  CPPFLAGS   = -DCONFIG_$(ARCH)
 -CFLAGS	   = $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants
-+CFLAGS	   = $(ARCH3264) -fmessage-length=0 -O2 -fpic -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -fshort-wchar -fno-strict-aliasing -fno-merge-constants
++OPTFLAGS   = -O2 -g
++CFLAGS	   = $(ARCH3264) $(OPTFLAGS) -fpic -fshort-wchar -fno-strict-aliasing -fno-merge-constants
  ASFLAGS    = $(ARCH3264)
  LDFLAGS	   = -nostdlib
  INSTALL	   = install
diff --git a/gnu-efi.changes b/gnu-efi.changes
index c7e9d3f..4eb915a 100644
--- a/gnu-efi.changes
+++ b/gnu-efi.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul 18 15:47:22 UTC 2012 - meissner@suse.com
+
+- cleaned below up, pass in OPTFLAGS and LIBDIR to make.
+
 -------------------------------------------------------------------
 Wed Jul 18 03:06:46 UTC 2012 - malcolmlewis@opensuse.org
 
diff --git a/gnu-efi.spec b/gnu-efi.spec
index d19ea96..95353e5 100644
--- a/gnu-efi.spec
+++ b/gnu-efi.spec
@@ -46,12 +46,10 @@ Authors:
 %patch0 -p1
 
 %build
-make LINUX_HEADERS=/usr/src/linux
+make LINUX_HEADERS=/usr/src/linux OPTFLAGS="$RPM_OPT_FLAGS"
 
 %install
-make install INSTALLROOT=%{buildroot}%{_prefix}
-[ "%{_lib}" == "lib" ] ||
-  mv %{buildroot}/usr/lib %{buildroot}/usr/%{_lib}
+make install INSTALLROOT=%{buildroot}%{_prefix} LIBDIR=%_lib
 %if 0
 mkdir %{buildroot}%{_prefix}/%{_lib}/%{name}
 cp -p apps/*.efi %{buildroot}%{_prefix}/%{_lib}/%{name}