From 3694714eaf3da11431ee8599fc693223114b30bf Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 12 Feb 2018 14:29:09 -0200 Subject: [PATCH] gnu-efi-libs: update to 3.0.6. Closes: #12014 [via git-merge-pr] --- srcpkgs/gnu-efi-libs/patches/build-fix.patch | 113 ------------------- srcpkgs/gnu-efi-libs/patches/no-werror.patch | 20 ++++ srcpkgs/gnu-efi-libs/template | 22 ++-- 3 files changed, 34 insertions(+), 121 deletions(-) delete mode 100644 srcpkgs/gnu-efi-libs/patches/build-fix.patch create mode 100644 srcpkgs/gnu-efi-libs/patches/no-werror.patch diff --git a/srcpkgs/gnu-efi-libs/patches/build-fix.patch b/srcpkgs/gnu-efi-libs/patches/build-fix.patch deleted file mode 100644 index 6ae6e8adcc0..00000000000 --- a/srcpkgs/gnu-efi-libs/patches/build-fix.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 0a69c42779d1d28aa406fa2c435b180156ee3435 Mon Sep 17 00:00:00 2001 -From: Fedora Ninjas -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/patches/no-werror.patch b/srcpkgs/gnu-efi-libs/patches/no-werror.patch new file mode 100644 index 00000000000..38a947603cf --- /dev/null +++ b/srcpkgs/gnu-efi-libs/patches/no-werror.patch @@ -0,0 +1,20 @@ +Source: Alpine Linux (adapted) +Upstream: No +Reason: Fixes compilation on i686 + +--- Make.defaults ++++ Make.defaults +@@ -156,11 +156,11 @@ ifneq (mingw32,$(findstring mingw32, $(GCCMACHINE))) + endif + + ifeq (FreeBSD, $(findstring FreeBSD, $(OS))) +-CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \ ++CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra \ + -fshort-wchar -fno-strict-aliasing \ + -ffreestanding -fno-stack-protector + else +-CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \ ++CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra \ + -fshort-wchar -fno-strict-aliasing \ + -fno-merge-all-constants -ffreestanding -fno-stack-protector \ + -fno-stack-check diff --git a/srcpkgs/gnu-efi-libs/template b/srcpkgs/gnu-efi-libs/template index 3125188e815..d446191ae37 100644 --- a/srcpkgs/gnu-efi-libs/template +++ b/srcpkgs/gnu-efi-libs/template @@ -1,21 +1,20 @@ # Template file for 'gnu-efi-libs' pkgname=gnu-efi-libs -version=3.0w +version=3.0.6 revision=1 -wrksrc="gnu-efi-${version/w/}" +wrksrc="gnu-efi-${version}" makedepends="pciutils-devel" nostrip=yes short_desc="Library for building UEFI Applications using GNU toolchain" maintainer="Juan RP " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://sourceforge.net/projects/gnu-efi/" -distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi_${version}.orig.tar.gz" -checksum=d5c5ca168d25bb54ea936a25175d7626778001f788bddc60dbed103874583621 +distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi-${version}.tar.bz2" +checksum=21515902d80fbea23328a61d70d3d51a47204abd1507ebfa27550a7b9bf22c91 do_build() { unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS - make - make -C apps all + make lib gnuefi inc apps } do_install() { @@ -26,5 +25,12 @@ do_install() { x86_64*) _EFI_ARCH="x86_64";; esac vmkdir usr/share/gnu-efi/apps/${_EFI_ARCH} - install -Dm644 apps/*.efi ${DESTDIR}/usr/share/gnu-efi/apps/${_EFI_ARCH} + + if [ "$XBPS_MACHINE" = "i686" ]; then + HOST_ARCH="ia32" + else + HOST_ARCH="${XBPS_MACHINE/-musl//}" + fi + + install -Dm644 "$HOST_ARCH"/apps/*.efi ${DESTDIR}/usr/share/gnu-efi/apps/${_EFI_ARCH} }