From 7e6a049a41ce08c3929cd8d48cef3f1b6070c1da31a9c2a9316d7bb6cdddf7b2 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 7 Nov 2012 16:22:24 +0000 Subject: [PATCH 1/2] - revert last change as it breaks the app completely OBS-URL: https://build.opensuse.org/package/show/Base:System/gnu-efi?expand=0&rev=9 --- gnu-efi.changes | 5 +++++ gnu-efi.spec | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu-efi.changes b/gnu-efi.changes index 4eb915a..880a352 100644 --- a/gnu-efi.changes +++ b/gnu-efi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 7 16:22:08 UTC 2012 - dmueller@suse.com + +- revert last change as it breaks the app completely + ------------------------------------------------------------------- Wed Jul 18 15:47:22 UTC 2012 - meissner@suse.com diff --git a/gnu-efi.spec b/gnu-efi.spec index 95353e5..159ce40 100644 --- a/gnu-efi.spec +++ b/gnu-efi.spec @@ -20,7 +20,7 @@ Name: gnu-efi Version: 3.0q Release: 0 Summary: Library for EFI Applications -License: BSD-3-Clause ; GPL-2.0+ +License: BSD-3-Clause and GPL-2.0+ Group: Development/Libraries/Other Url: http://sourceforge.net/projects/gnu-efi Source: http://downloads.sourceforge.net/gnu-efi/gnu-efi_3.0q.orig.tar.gz @@ -46,7 +46,11 @@ Authors: %patch0 -p1 %build -make LINUX_HEADERS=/usr/src/linux OPTFLAGS="$RPM_OPT_FLAGS" +########################## +## DO NOT ADD RPM OPT FLAGS! THIS DOES NOT BUILD AGAINST GLIBC +## +########################## +make LINUX_HEADERS=/usr/src/linux %install make install INSTALLROOT=%{buildroot}%{_prefix} LIBDIR=%_lib From b5c755cf4b77db86214a6e6ba0b739c7221643cdbb0343b533e7a95e217246cc Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 7 Nov 2012 16:29:44 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Base:System/gnu-efi?expand=0&rev=10 --- gnu-efi-add-optflags-to-make-defaults.patch | 14 -------------- gnu-efi.spec | 3 --- 2 files changed, 17 deletions(-) delete mode 100644 gnu-efi-add-optflags-to-make-defaults.patch diff --git a/gnu-efi-add-optflags-to-make-defaults.patch b/gnu-efi-add-optflags-to-make-defaults.patch deleted file mode 100644 index acf1291..0000000 --- a/gnu-efi-add-optflags-to-make-defaults.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 -+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.spec b/gnu-efi.spec index 159ce40..2d3730c 100644 --- a/gnu-efi.spec +++ b/gnu-efi.spec @@ -25,8 +25,6 @@ Group: Development/Libraries/Other Url: http://sourceforge.net/projects/gnu-efi Source: http://downloads.sourceforge.net/gnu-efi/gnu-efi_3.0q.orig.tar.gz Source1: %{name}-rpmlintrc -# PATCH-FIX-OPENSUSE gnu-efi-add-optflags-to-make-defaults.patch malcolmlewis@opensuse.org -- Add additional RPM OPT FLAGS to Make.defaults to avoid brp check warning. -Patch0: gnu-efi-add-optflags-to-make-defaults.patch BuildRequires: kernel-source BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ia64 %ix86 x86_64 @@ -43,7 +41,6 @@ Authors: %prep %setup -q -n gnu-efi-3.0 -%patch0 -p1 %build ##########################