From fe0ef033be2a54043bec317d16becdf58e55f059 Mon Sep 17 00:00:00 2001
From: Eivind Uggedal <eivind@uggedal.com>
Date: Thu, 4 Sep 2014 19:04:11 +0000
Subject: [PATCH] gnu-efi-libs: update to 3.0w and fix build

---
 srcpkgs/gnu-efi-libs/patches/build-fix.patch | 113 +++++++++++++++++++
 srcpkgs/gnu-efi-libs/template                |   6 +-
 2 files changed, 116 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/gnu-efi-libs/patches/build-fix.patch

diff --git a/srcpkgs/gnu-efi-libs/patches/build-fix.patch b/srcpkgs/gnu-efi-libs/patches/build-fix.patch
new file mode 100644
index 00000000000..6ae6e8adcc0
--- /dev/null
+++ b/srcpkgs/gnu-efi-libs/patches/build-fix.patch
@@ -0,0 +1,113 @@
+From 0a69c42779d1d28aa406fa2c435b180156ee3435 Mon Sep 17 00:00:00 2001
+From: Fedora Ninjas <pjones@fedoraproject.org>
+Date: Thu, 15 May 2014 21:29:25 -0400
+Subject: [PATCH] Try to make this build.
+
+---
+ Make.defaults 
+ inc/Makefile  
+ 2 files changed, 12 insertions(+), 22 deletion(-)
+
+diff -up a/gnuefi/Makefile b/gnuefi/Makefile
+--- gnuefi/Makefile	2014-05-15 17:15:54.000000000 -0500
++++ gnuefi/Makefile	2014-05-19 14:02:29.048732554 -0500
+@@ -52,19 +52,6 @@ reloc_aarch64.o: CFLAGS += -fno-jump-tab
+ 
+ TARGETS	= crt0-efi-$(ARCH).o libgnuefi.a
+ 
+-INSTALLTARGETS = $(TARGETS)
+-ifneq (,$(findstring FreeBSD,$(OS)))
+- ifeq ($(ARCH),x86_64)
+-  INSTALLTARGETS += elf_$(ARCH)_fbsd_efi.lds
+- else
+-  INSTALLTARGETS += elf_$(ARCH)_efi.lds
+- endif
+-else
+-  INSTALLTARGETS += elf_$(ARCH)_efi.lds
+-endif
+-
+-LIBDIRINSTALL = $(INSTALLROOT)/$(LIBDIR)
+-
+ all:	$(TARGETS)
+ 
+ libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS))
+@@ -72,14 +59,17 @@ libgnuefi.a: $(patsubst %,libgnuefi.a(%)
+ clean:
+ 	rm -f $(TARGETS) *~ *.o $(OBJS)
+ 
+-$(LIBDIRINSTALL):
+-	mkdir -p $@
+-
+-.SECONDEXPANSION:
+-
+-$(LIBDIRINSTALL)/%: % | $$(dir $$@)
+-	$(INSTALL) -m 644 $< $(dir $@)
+-
+-install: $(addprefix $(LIBDIRINSTALL)/,$(INSTALLTARGETS))
++install:
++	mkdir -p $(INSTALLROOT)/$(LIBDIR)
++	$(INSTALL) -m 644 $(TARGETS) $(INSTALLROOT)/$(LIBDIR)
++ifneq (,$(findstring FreeBSD,$(OS)))
++ ifeq ($(ARCH),x86_64)
++	$(INSTALL) -m 644 elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)/$(LIBDIR)
++ else
++	$(INSTALL) -m 644 elf_$(ARCH)_efi.lds $(INSTALLROOT)/$(LIBDIR)
++ endif
++else
++	$(INSTALL) -m 644 elf_$(ARCH)_efi.lds $(INSTALLROOT)/$(LIBDIR)
++endif
+ 
+ include $(SRCDIR)/../Make.rules
+diff --git a/inc/Makefile b/inc/Makefile
+index 526af22..71fded5 100644
+--- inc/Makefile
++++ inc/Makefile
+@@ -8,34 +8,20 @@ TOPDIR = $(SRCDIR)/..
+ 
+ CDIR=$(TOPDIR)/..
+ 
+-INCDIRINSTALL = $(INSTALLROOT)$(PREFIX)/include/efi
+-
+-SRCHEADERS = $(wildcard $(SRCDIR)/*.h) \
+-             $(wildcard $(SRCDIR)/protocol/*.h) \
+-             $(wildcard $(SRCDIR)/$(ARCH)/*.h)
+-ifeq ($(ARCH),ia64)
+- SRCHEADERS += $(wildcard $(SRCDIR)/protocol/$(ARCH)/*.h)
+-endif
+-
+-HEADERS = $(patsubst $(SRCDIR)/%,%,$(SRCHEADERS))
+-
+ all:
+ 
+ clean:
+ 
+-	rm -f *~
+-
+-$(INCDIRINSTALL) \
+-$(INCDIRINSTALL)/protocol \
+-$(INCDIRINSTALL)/$(ARCH) \
+-$(INCDIRINSTALL)/protocol/$(ARCH):
+-	mkdir -p $@
+-
+-.SECONDEXPANSION:
+-
+-$(INCDIRINSTALL)/%.h: %.h | $$(dir $$@)
+-	$(INSTALL) -m 644 $< $(dir $@)
+-
+-install: $(addprefix $(INCDIRINSTALL)/,$(HEADERS))
++install:
++	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi
++	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol
++	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
++	$(INSTALL) -m 644 *.h $(INSTALLROOT)$(PREFIX)/include/efi
++	$(INSTALL) -m 644 protocol/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol
++	$(INSTALL) -m 644 $(ARCH)/*.h $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
++ifeq ($(ARCH),ia64)
++	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64
++	$(INSTALL) -m 644 protocol/ia64/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64
++endif
+ 
+ include $(SRCDIR)/../Make.rules
+-- 
+1.8.3.1
+
diff --git a/srcpkgs/gnu-efi-libs/template b/srcpkgs/gnu-efi-libs/template
index 38b95efdf39..f1518702163 100644
--- a/srcpkgs/gnu-efi-libs/template
+++ b/srcpkgs/gnu-efi-libs/template
@@ -1,8 +1,8 @@
 # Template file for 'gnu-efi-libs'
 pkgname=gnu-efi-libs
-version=3.0v
+version=3.0w
 revision=1
-wrksrc="gnu-efi-${version/v/}"
+wrksrc="gnu-efi-${version/w/}"
 makedepends="pciutils-devel"
 nostrip=yes
 short_desc="Library for building UEFI Applications using GNU toolchain"
@@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://sourceforge.net/projects/gnu-efi/"
 distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi_${version}.orig.tar.gz"
-checksum=c776f98d671086e44503f0dc2809151638d395681fe8011f5affd09452bd0fdf
+checksum=d5c5ca168d25bb54ea936a25175d7626778001f788bddc60dbed103874583621
 
 do_build() {
 	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS