- 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
This commit is contained in:
Marcus Meissner 2012-07-18 15:47:48 +00:00 committed by Git OBS Bridge
parent 53807894eb
commit 2d76c7d932
3 changed files with 14 additions and 9 deletions

View File

@ -1,12 +1,14 @@
diff -Naur a/Make.defaults b/Make.defaults Index: gnu-efi-3.0/Make.defaults
--- a/Make.defaults 2012-04-30 10:35:44.000000000 -0500 ===================================================================
+++ b/Make.defaults 2012-07-16 21:39:42.208929565 -0500 --- gnu-efi-3.0.orig/Make.defaults
@@ -48,7 +48,7 @@ +++ gnu-efi-3.0/Make.defaults
@@ -48,7 +48,8 @@ ARCH := $(shell uname -m | sed s,i[34
OS = $(shell uname -s) OS = $(shell uname -s)
INCDIR = -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) -I$(TOPDIR)/inc/protocol INCDIR = -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) -I$(TOPDIR)/inc/protocol
CPPFLAGS = -DCONFIG_$(ARCH) CPPFLAGS = -DCONFIG_$(ARCH)
-CFLAGS = $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants -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) ASFLAGS = $(ARCH3264)
LDFLAGS = -nostdlib LDFLAGS = -nostdlib
INSTALL = install INSTALL = install

View File

@ -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 Wed Jul 18 03:06:46 UTC 2012 - malcolmlewis@opensuse.org

View File

@ -46,12 +46,10 @@ Authors:
%patch0 -p1 %patch0 -p1
%build %build
make LINUX_HEADERS=/usr/src/linux make LINUX_HEADERS=/usr/src/linux OPTFLAGS="$RPM_OPT_FLAGS"
%install %install
make install INSTALLROOT=%{buildroot}%{_prefix} make install INSTALLROOT=%{buildroot}%{_prefix} LIBDIR=%_lib
[ "%{_lib}" == "lib" ] ||
mv %{buildroot}/usr/lib %{buildroot}/usr/%{_lib}
%if 0 %if 0
mkdir %{buildroot}%{_prefix}/%{_lib}/%{name} mkdir %{buildroot}%{_prefix}/%{_lib}/%{name}
cp -p apps/*.efi %{buildroot}%{_prefix}/%{_lib}/%{name} cp -p apps/*.efi %{buildroot}%{_prefix}/%{_lib}/%{name}