[arch-commits] Commit in gnu-efi-libs/trunk (3 files)

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Mon Nov 10 08:01:02 UTC 2014


    Date: Monday, November 10, 2014 @ 09:01:02
  Author: bpiotrowski
Revision: 225812

upgpkg: gnu-efi-libs 3.0w-2

add patch to correctly ship headers

Added:
  gnu-efi-libs/trunk/build-fix.patch
Modified:
  gnu-efi-libs/trunk/PKGBUILD
Deleted:
  gnu-efi-libs/trunk/gnu-efi-3.0v-revert-makefile-commit.patch

-------------------------------------------+
 PKGBUILD                                  |   24 ++--
 build-fix.patch                           |  113 +++++++++++++++++++++
 gnu-efi-3.0v-revert-makefile-commit.patch |  148 ----------------------------
 3 files changed, 127 insertions(+), 158 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-10 07:37:45 UTC (rev 225811)
+++ PKGBUILD	2014-11-10 08:01:02 UTC (rev 225812)
@@ -8,7 +8,7 @@
 _pkgver="3.0"
 pkgname="gnu-efi-libs"
 pkgver="${_pkgver}w"
-pkgrel="1"
+pkgrel="2"
 pkgdesc="Library for building UEFI Applications using GNU toolchain"
 url="http://sourceforge.net/projects/gnu-efi/"
 license=('GPL')
@@ -15,27 +15,31 @@
 arch=('x86_64' 'i686')
 options=('!strip' '!makeflags' '!buildflags' 'staticlibs')
 makedepends=('pciutils')
+source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz"
+        "build-fix.patch")
 
-source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz")
+prepare() {
+	cd "${srcdir}/gnu-efi-${_pkgver}/"
 
+	patch -p1 -i "${srcdir}/build-fix.patch"
+}
+
 build() {
-	
 	cd "${srcdir}/gnu-efi-${_pkgver}/"
-	
+
 	make -j1
 	make -j1 -C apps all
-	
+
 }
 
 package() {
-	
 	cd "${srcdir}/gnu-efi-${_pkgver}/"
-	
+
 	make INSTALLROOT="${pkgdir}" PREFIX="/usr" LIBDIR="/usr/lib" install
-	
+
 	install -d "${pkgdir}/usr/share/gnu-efi/apps/${_EFI_ARCH}/"
 	install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/apps/${_EFI_ARCH}/"
-	
 }
 
-md5sums=('36d1c5e7b6edd4733700aaf749d9b80c')
+md5sums=('36d1c5e7b6edd4733700aaf749d9b80c'
+         'c4f8e361fd3e133da1ef8307a302c424')

Added: build-fix.patch
===================================================================
--- build-fix.patch	                        (rev 0)
+++ build-fix.patch	2014-11-10 08:01:02 UTC (rev 225812)
@@ -0,0 +1,113 @@
+From 0a69c42779d1d28aa406fa2c435b180156ee3435 Mon Sep 17 00:00:00 2001
+From: Fedora Ninjas <pjones at 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
+--- a/gnuefi/Makefile	2014-05-15 17:15:54.000000000 -0500
++++ b/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
+--- a/inc/Makefile
++++ b/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
+

Deleted: gnu-efi-3.0v-revert-makefile-commit.patch
===================================================================
--- gnu-efi-3.0v-revert-makefile-commit.patch	2014-11-10 07:37:45 UTC (rev 225811)
+++ gnu-efi-3.0v-revert-makefile-commit.patch	2014-11-10 08:01:02 UTC (rev 225812)
@@ -1,148 +0,0 @@
-commit 06744d69273de4945cf0ffcaa4a6abf7cec707b6
-Author: Nigel Croxon <nigel.croxon at hp.com>
-Date:   Fri Mar 14 13:47:39 2014 -0400
-
-    From: Sylvain Gault <sylvain.gault at gmail.com>
-    Date: Wed, 19 Feb 2014 05:18:14 +0100
-    Subject: [PATCH] make install: Don't overwrite up-to-date files
-    
-    make install used to copy files unconditionnally to their destination.
-    However, if the destination is used by another Makefile, it will always
-    see modified files. "install" target now only update the files when they
-    need to.
-    
-    Signed-off-by: Sylvain Gault <sylvain.gault at gmail.com>
-    Signed-off-by: Nigel Croxon <nigel.croxon at hp.com>
-
-diff --git a/gnuefi/Makefile b/gnuefi/Makefile
-index e99adbe..85a7db8 100644
---- a/gnuefi/Makefile
-+++ b/gnuefi/Makefile
-@@ -49,6 +49,19 @@ OBJS	= $(FILES:%=%.o)
- 
- 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))
-@@ -56,17 +69,14 @@ libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS))
- clean:
- 	rm -f $(TARGETS) *~ *.o $(OBJS)
- 
--install:
--	mkdir -p $(INSTALLROOT)/$(LIBDIR)
--	$(INSTALL) -m 644 $(TARGETS) $(INSTALLROOT)/$(LIBDIR)
--ifneq (,$(findstring FreeBSD,$(OS)))
-- ifeq ($(ARCH),x86_64)
--	$(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)/$(LIBDIR)
-- else
--	$(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)/$(LIBDIR)
-- endif
--else
--	$(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)/$(LIBDIR)
--endif
-+$(LIBDIRINSTALL):
-+	mkdir -p $@
-+
-+.SECONDEXPANSION:
-+
-+$(LIBDIRINSTALL)/%: % | $$(dir $$@)
-+	$(INSTALL) -m 644 $< $(dir $@)
-+
-+install: $(addprefix $(LIBDIRINSTALL)/,$(INSTALLTARGETS))
- 
- include $(SRCDIR)/../Make.rules
-diff --git a/inc/Makefile b/inc/Makefile
-index 273d303..297385b 100644
---- a/inc/Makefile
-+++ b/inc/Makefile
-@@ -8,20 +8,32 @@ 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:
- 
--install:
--	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi
--	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol
--	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
--	$(INSTALL) -m 644 $(SRCDIR)/*.h $(INSTALLROOT)$(PREFIX)/include/efi
--	$(INSTALL) -m 644 $(SRCDIR)/protocol/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol
--	$(INSTALL) -m 644 $(SRCDIR)/$(ARCH)/*.h $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
--ifeq ($(ARCH),ia64)
--	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64
--	$(INSTALL) -m 644 $(SRCDIR)/protocol/ia64/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64
--endif
-+$(INCDIRINSTALL) \
-+$(INCDIRINSTALL)/protocol \
-+$(INCDIRINSTALL)/$(ARCH) \
-+$(INCDIRINSTALL)/protocol/$(ARCH):
-+	mkdir -p $@
-+
-+.SECONDEXPANSION:
-+
-+$(INCDIRINSTALL)/%.h: %.h | $$(dir $$@)
-+	$(INSTALL) -m 644 $< $(dir $@)
-+
-+install: $(addprefix $(INCDIRINSTALL)/,$(HEADERS))
- 
- include $(SRCDIR)/../Make.rules
-diff --git a/lib/Makefile b/lib/Makefile
-index e9f604e..d2635ad 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -61,8 +61,11 @@ OBJS  = $(FILES:%=%.o)
- 
- SUBDIRS = ia32 x86_64 ia64 runtime
- 
-+LIBDIRINSTALL = $(INSTALLROOT)/$(LIBDIR)
-+
- all: libsubdirs libefi.a
- 
-+.PHONY: libsubdirs
- libsubdirs:
- 	for sdir in $(SUBDIRS); do mkdir -p $$sdir; done
- 
-@@ -71,9 +74,13 @@ libefi.a: $(patsubst %,libefi.a(%),$(OBJS))
- clean:
- 	rm -f libefi.a *~ $(OBJS) */*.o
- 
--install: libefi.a
--	mkdir -p $(INSTALLROOT)/$(LIBDIR)
--	$(INSTALL) -m 644 libefi.a $(INSTALLROOT)/$(LIBDIR)
-+$(LIBDIRINSTALL):
-+	mkdir -p $@
-+
-+$(LIBDIRINSTALL)/libefi.a: libefi.a | $(LIBDIRINSTALL)
-+	$(INSTALL) -m 644 $< $(dir $@)
-+
-+install: $(LIBDIRINSTALL)/libefi.a
- 
- include $(SRCDIR)/../Make.rules
- 


More information about the arch-commits mailing list