[packages/gnu-efi] - updated to 3.0w - added make patch (workaround to build with GNU make 4.0)

[qboosh]

commit 9808f4d49bb71f5b8aa7d21d9efecb780861a211
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Sep 5 15:59:09 2014 +0200

    - updated to 3.0w
    - added make patch (workaround to build with GNU make 4.0)

 gnu-efi-make.patch | 29 +++++++++++++++++++++++++++++
 gnu-efi.spec       | 27 ++++++++++++---------------
 2 files changed, 41 insertions(+), 15 deletions(-)
---
diff --git a/gnu-efi.spec b/gnu-efi.spec
index 8b0929e..94b59f4 100644
--- a/gnu-efi.spec
+++ b/gnu-efi.spec
@@ -2,23 +2,27 @@ Summary:	GNU-EFI - building EFI applications using the GNU toolchain
 Summary(pl.UTF-8):	GNU-EFI - tworzenie aplikacji EFI przy użyciu narzędzi GNU
 Name:		gnu-efi
 # NOTE: don't use early 3.1, it doesn't support EFI x86_64
-Version:	3.0u
+Version:	3.0w
 Release:	1
 # Intel and HP's BSD-like license, except setjmp code coming from GRUB
-License:	GPL v2+ (setjmp code), BSD-like (all the rest)
+License:	BSD-like
 Group:		Development/Libraries
 Source0:	http://downloads.sourceforge.net/gnu-efi/%{name}_%{version}.orig.tar.gz
-# Source0-md5:	d15d3c700e79a1e2938544d73edc572d
+# Source0-md5:	36d1c5e7b6edd4733700aaf749d9b80c
+Patch0:		%{name}-make.patch
 URL:		http://gnu-efi.sourceforge.net/
 BuildRequires:	binutils >= 3:2.17.50.0.14
 BuildRequires:	gcc >= 6:4.1.1
 Requires:	binutils >= 3:2.17.50.0.14
 Requires:	gcc >= 6:4.1.1
-ExclusiveArch:	%{ix86} %{x8664} ia64
+# FIXME: arm[64] or aarch64? (only 64-bit ARM supported in this version; git supports 32-bit too)
+ExclusiveArch:	%{ix86} %{x8664} arm ia64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags_ia64	-frename-registers
 
+%define		efi_arch	%(echo %{_target_base_arch} | sed -e 's/i386/ia32/')
+
 %description
 GNU-EFI development environment allows to create EFI applications for
 IA-64 and x86 platforms using the GNU toolchain.
@@ -29,27 +33,20 @@ dla platform IA-64 i x86 przy użyciu narzędzi GNU.
 
 %prep
 %setup -q -n %{name}-3.0
+%patch0 -p1
 
 %build
-%ifarch %{x8664}
-CFADD=" -DEFI_FUNCTION_WRAPPER -mno-red-zone"
-%else
-%ifarch ia64
-CFADD=" -mfixed-range=f32-f127"
-%else
-CFADD=
-%endif
-%endif
+CFLAGS="%{rpmcflags}" \
 %{__make} -j1 \
-	ARCH=$(echo %{_target_base_arch} | sed -e 's/i386/ia32/') \
+	ARCH=%{efi_arch} \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants -fno-stack-protector$CFADD" \
 	OBJCOPY=objcopy
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
+	ARCH=%{efi_arch} \
 	INSTALLROOT=$RPM_BUILD_ROOT \
 	PREFIX=%{_prefix} \
 	LIBDIR=%{_libdir}
diff --git a/gnu-efi-make.patch b/gnu-efi-make.patch
new file mode 100644
index 0000000..d04827d
--- /dev/null
+++ b/gnu-efi-make.patch
@@ -0,0 +1,29 @@
+Workaround for make 4.0 compatibility
+--- gnu-efi-3.0/gnuefi/Makefile.orig	2014-09-04 19:12:43.901772181 +0200
++++ gnu-efi-3.0/gnuefi/Makefile	2014-09-04 19:12:47.435105396 +0200
+@@ -72,7 +72,7 @@
+ clean:
+ 	rm -f $(TARGETS) *~ *.o $(OBJS)
+ 
+-$(LIBDIRINSTALL):
++$(LIBDIRINSTALL)/:
+ 	mkdir -p $@
+ 
+ .SECONDEXPANSION:
+--- gnu-efi-3.0/inc/Makefile.orig	2014-09-04 22:01:21.638014047 +0200
++++ gnu-efi-3.0/inc/Makefile	2014-09-04 22:01:37.774679986 +0200
+@@ -25,10 +25,10 @@
+ 
+ 	rm -f *~
+ 
+-$(INCDIRINSTALL) \
+-$(INCDIRINSTALL)/protocol \
+-$(INCDIRINSTALL)/$(ARCH) \
+-$(INCDIRINSTALL)/protocol/$(ARCH):
++$(INCDIRINSTALL)/ \
++$(INCDIRINSTALL)/protocol/ \
++$(INCDIRINSTALL)/$(ARCH)/ \
++$(INCDIRINSTALL)/protocol/$(ARCH)/:
+ 	mkdir -p $@
+ 
+ .SECONDEXPANSION:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnu-efi.git/commitdiff/9808f4d49bb71f5b8aa7d21d9efecb780861a211