Date: Wednesday, May 28, 2014 @ 18:21:09 Author: tpowa Revision: 213696
upgpkg: gnu-efi-libs 3.0v-2 fix headers Modified: gnu-efi-libs/trunk/PKGBUILD gnu-efi-libs/trunk/gnu-efi-3.0v-revert-makefile-commit.patch -------------------------------------------+ PKGBUILD | 19 +- gnu-efi-3.0v-revert-makefile-commit.patch | 224 ++++++++++++++-------------- 2 files changed, 122 insertions(+), 121 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-05-28 14:59:27 UTC (rev 213695) +++ PKGBUILD 2014-05-28 16:21:09 UTC (rev 213696) @@ -1,11 +1,14 @@ # Maintainer: Tobias Powalowski <[email protected]> -# Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> +# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Contributor: Alessio 'mOLOk' Bolognino <[email protected]> +[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64" +[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="ia32" + _pkgver="3.0" pkgname="gnu-efi-libs" pkgver="${_pkgver}v" -pkgrel="1" +pkgrel="2" pkgdesc="Library for building UEFI Applications using GNU toolchain" url="http://sourceforge.net/projects/gnu-efi/"; license=('GPL') @@ -16,12 +19,9 @@ source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz"; 'gnu-efi-3.0v-revert-makefile-commit.patch') -[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64" -[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="ia32" - -perpare() { - cd "${srcdir}/gnu-efi-${_pkgver}/" - patch -Np1 -i "${srcdir}/gnu-efi-3.0v-revert-makefile-commit.patch" +prepare() { + cd "${srcdir}/gnu-efi-${_pkgver}/" + patch -Np1 -R -i "${srcdir}/gnu-efi-3.0v-revert-makefile-commit.patch" } build() { @@ -50,5 +50,6 @@ install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/apps/${_EFI_ARCH}/" } + md5sums=('57f0a308c0e939e5d18e40840a5484a9' - '19daf1c655747fb6cc7f37a18623ae26') + '97ef85cd3d4aba2349aa1fab706568ab') Modified: gnu-efi-3.0v-revert-makefile-commit.patch =================================================================== --- gnu-efi-3.0v-revert-makefile-commit.patch 2014-05-28 14:59:27 UTC (rev 213695) +++ gnu-efi-3.0v-revert-makefile-commit.patch 2014-05-28 16:21:09 UTC (rev 213696) @@ -1,148 +1,148 @@ -From 3100a29932662dd8b045ca0a2c3329e67b2b2df3 Mon Sep 17 00:00:00 2001 -From: Keshav Amburay <[email protected]> -Date: Tue, 13 May 2014 14:14:31 -0400 -Subject: [PATCH] Revert 06744d69273de4945cf0ffcaa4a6abf7cec707b6 +commit 06744d69273de4945cf0ffcaa4a6abf7cec707b6 +Author: Nigel Croxon <[email protected]> +Date: Fri Mar 14 13:47:39 2014 -0400 ---- - gnu-efi-3.0/gnuefi/Makefile | 34 ++++++++++++---------------------- - gnu-efi-3.0/inc/Makefile | 36 +++++++++++------------------------- - gnu-efi-3.0/lib/Makefile | 13 +++---------- - 3 files changed, 26 insertions(+), 57 deletions(-) + From: Sylvain Gault <[email protected]> + 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 <[email protected]> + Signed-off-by: Nigel Croxon <[email protected]> -diff --git a/gnu-efi-3.0/gnuefi/Makefile b/gnu-efi-3.0/gnuefi/Makefile -index 71e93f9..27f43b7 100644 ---- a/gnu-efi-3.0/gnuefi/Makefile -+++ b/gnu-efi-3.0/gnuefi/Makefile -@@ -49,19 +49,6 @@ OBJS = $(FILES:%=%.o) +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) ++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) -- INSTALLTARGETS += elf_$(ARCH)_fbsd_efi.lds +- $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)/$(LIBDIR) - else -- INSTALLTARGETS += elf_$(ARCH)_efi.lds +- $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)/$(LIBDIR) - endif -else -- INSTALLTARGETS += elf_$(ARCH)_efi.lds +- $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)/$(LIBDIR) -endif -- --LIBDIRINSTALL = $(INSTALLROOT)/$(LIBDIR) -- - all: $(TARGETS) ++$(LIBDIRINSTALL): ++ mkdir -p $@ ++ ++.SECONDEXPANSION: ++ ++$(LIBDIRINSTALL)/%: % | $$(dir $$@) ++ $(INSTALL) -m 644 $< $(dir $@) ++ ++install: $(addprefix $(LIBDIRINSTALL)/,$(INSTALLTARGETS)) - libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS)) -@@ -69,14 +56,17 @@ libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS)) - 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 $(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 - include $(SRCDIR)/../Make.rules -diff --git a/gnu-efi-3.0/inc/Makefile b/gnu-efi-3.0/inc/Makefile -index 526af22..273d303 100644 ---- a/gnu-efi-3.0/inc/Makefile -+++ b/gnu-efi-3.0/inc/Makefile -@@ -8,34 +8,20 @@ TOPDIR = $(SRCDIR)/.. +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)) -- ++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 $(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 +-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/gnu-efi-3.0/lib/Makefile b/gnu-efi-3.0/lib/Makefile -index d2635ad..e9f604e 100644 ---- a/gnu-efi-3.0/lib/Makefile -+++ b/gnu-efi-3.0/lib/Makefile -@@ -61,11 +61,8 @@ OBJS = $(FILES:%=%.o) +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) -- ++LIBDIRINSTALL = $(INSTALLROOT)/$(LIBDIR) ++ all: libsubdirs libefi.a --.PHONY: libsubdirs ++.PHONY: libsubdirs libsubdirs: for sdir in $(SUBDIRS); do mkdir -p $$sdir; done -@@ -74,13 +71,9 @@ libefi.a: $(patsubst %,libefi.a(%),$(OBJS)) +@@ -71,9 +74,13 @@ libefi.a: $(patsubst %,libefi.a(%),$(OBJS)) clean: rm -f libefi.a *~ $(OBJS) */*.o --$(LIBDIRINSTALL): -- mkdir -p $@ -- --$(LIBDIRINSTALL)/libefi.a: libefi.a | $(LIBDIRINSTALL) -- $(INSTALL) -m 644 $< $(dir $@) -- --install: $(LIBDIRINSTALL)/libefi.a -+install: libefi.a -+ mkdir -p $(INSTALLROOT)/$(LIBDIR) -+ $(INSTALL) -m 644 libefi.a $(INSTALLROOT)/$(LIBDIR) +-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 --- -1.9.2 -
