Date: Friday, April 8, 2022 @ 18:09:38 Author: dvzrv Revision: 442054
upgpkg: gnu-efi 3.0.14-3: Rebuild to remove distribution flags. Do not strip resulting files. Do not apply distribution CFLAGS aside from LTO and -O2: https://bugs.archlinux.org/task/73137 Remove unneeded quotes and curly braces. Remove unneeded patch for altering LDFLAGS. Modified: gnu-efi/trunk/PKGBUILD Deleted: gnu-efi/trunk/gnu-efi-3.0.12-ldflags.patch ------------------------------+ PKGBUILD | 36 +++++++++++++++++------------------- gnu-efi-3.0.12-ldflags.patch | 12 ------------ 2 files changed, 17 insertions(+), 31 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-04-08 18:08:00 UTC (rev 442053) +++ PKGBUILD 2022-04-08 18:09:38 UTC (rev 442054) @@ -2,7 +2,7 @@ pkgname=gnu-efi pkgver=3.0.14 -pkgrel=2 +pkgrel=3 pkgdesc="Develop EFI applications using the GNU toolchain and the EFI development environment" arch=(x86_64) url="https://sourceforge.net/projects/gnu-efi/"; @@ -10,25 +10,23 @@ conflicts=(gnu-efi-libs) provides=(gnu-efi-libs) replaces=(gnu-efi-libs) -source=("https://download.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"; - "${pkgname}-3.0.12-ldflags.patch") -sha512sums=('37420ba3804e8547451a7b143a689ceb6af0557234fa7801efdeba3c2fc581a5354fe34cbaacb338d7b394d913e7274098ebf07026b7c1d50b2236d7f86c470c' - '7fd1c8d09ff870c33ae62887b657a7367f85a07f6709d33471ca13117a08e755853fd1e99db492d1db47444b95ae871078c4a913ed70aa7236e49349046e06b6') -b2sums=('c7f9127d3bb7e5e2bc52f5fc7be3376ddc5076b262e5db5a30a997cf10bf10288da63ded64d11327fad09190a803ce26e82b32aea2d8525ee0d1e1a23ebadff2' - 'c1633240ee6363c1df2ae5d7aab5a76a8fe93fd86a2c9a4973b8b30273e1512914c67c88483d0880cfca00df38b3b62fe9e1cd173b139b622ee83f0db835320f') +source=(https://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) +options=(!strip) +sha512sums=('37420ba3804e8547451a7b143a689ceb6af0557234fa7801efdeba3c2fc581a5354fe34cbaacb338d7b394d913e7274098ebf07026b7c1d50b2236d7f86c470c') +b2sums=('c7f9127d3bb7e5e2bc52f5fc7be3376ddc5076b262e5db5a30a997cf10bf10288da63ded64d11327fad09190a803ce26e82b32aea2d8525ee0d1e1a23ebadff2') prepare() { - cd "$pkgname-$pkgver" # -Werror, not even once - sed -e 's/-Werror//g' -i Make.defaults - # insert LDFLFAGS into custom linker for apps - patch -Np1 -i "../${pkgname}-3.0.12-ldflags.patch" + sed -e 's/-Werror//g' -i $pkgname-$pkgver/Make.defaults } build() { - cd "$pkgname-$pkgver" - # fat-lto-objects is required for non-mangled (static) object files - CFLAGS+=" -ffat-lto-objects" + cd $pkgname-$pkgver + # NOTE: apply only minimal CFLAGS, as gnu-efi does not provide userspace + # libs, but may be used in unitialized machine state and should therefore not + # be architecture optmized + # NOTE: fat-lto-objects is required for non-mangled (static) object files + CFLAGS="-O2 -flto -ffat-lto-objects" make make -C lib make -C gnuefi @@ -40,9 +38,9 @@ } package() { - cd "$pkgname-$pkgver" - make INSTALLROOT="$pkgdir/" PREFIX='/usr' install - install -vDm 644 apps/*.efi -t "${pkgdir}/usr/share/${pkgname}/apps/$CARCH" - install -vDm 644 README.efilib -t "${pkgdir}/usr/share/licenses/${pkgname}" - install -vDm 644 {ChangeLog,README.{gnuefi,git,elilo}} -t "${pkgdir}/usr/share/doc/${pkgname}" + cd $pkgname-$pkgver + make INSTALLROOT="$pkgdir" PREFIX=/usr install + install -vDm 644 apps/*.efi -t "$pkgdir/usr/share/$pkgname/apps/$CARCH/" + install -vDm 644 README.efilib -t "$pkgdir/usr/share/licenses/$pkgname/" + install -vDm 644 {ChangeLog,README.{gnuefi,git,elilo}} -t "$pkgdir/usr/share/doc/$pkgname/" } Deleted: gnu-efi-3.0.12-ldflags.patch =================================================================== --- gnu-efi-3.0.12-ldflags.patch 2022-04-08 18:08:00 UTC (rev 442053) +++ gnu-efi-3.0.12-ldflags.patch 2022-04-08 18:09:38 UTC (rev 442054) @@ -1,12 +0,0 @@ -diff -ruN a/apps/Makefile b/apps/Makefile ---- a/apps/Makefile 2020-05-11 17:05:20.000000000 +0200 -+++ b/apps/Makefile 2020-05-26 00:32:48.470418674 +0200 -@@ -52,7 +52,7 @@ - LDSCRIPT = $(TOPDIR)/gnuefi/elf_$(ARCH)_fbsd_efi.lds - endif - --LDFLAGS += -shared -Bsymbolic -L../lib -L../gnuefi $(CRTOBJS) -+LDFLAGS += -O1 --sort-common --as-needed -z relro -z now -shared -Bsymbolic -L../lib -L../gnuefi $(CRTOBJS) - - LOADLIBES += -lefi -lgnuefi - LOADLIBES += $(LIBGCC)
