summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLlewelyn Trahaearn2018-07-26 10:15:04 -0700
committerLlewelyn Trahaearn2018-07-26 10:15:04 -0700
commit94d9003d6882600828b6eb63fe5f5908b1e3fdc7 (patch)
treed21c149d6410eedc3fb835840222b26e46b2d89c
parent62595af972b298c21a0b44fa948d8507a9e4ea1f (diff)
downloadaur-94d9003d6882600828b6eb63fe5f5908b1e3fdc7.tar.gz
Remove duplicate symbol workaround for i386-efi build as this has been resolved upstream.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD11
2 files changed, 2 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d1537c2e1d91..0cccdd06c847 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = grub-git
pkgdesc = GNU GRand Unified Bootloader (2)
- pkgver = 2.02.r152.gec2de93f8
+ pkgver = 2.02.r164.gc79ebcd18
pkgrel = 1
url = https://www.gnu.org/software/grub/
install = grub-git.install
diff --git a/PKGBUILD b/PKGBUILD
index 7d8a51b36a5b..cdf5d9b1fef6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _UNIFONT_VER="10.0.06"
[[ "${CARCH}" == "i686" ]] && _EMU_ARCH="i386"
pkgname="grub-git"
-pkgver=2.02.r152.gec2de93f8
+pkgver=2.02.r164.gc79ebcd18
pkgrel=1
pkgdesc="GNU GRand Unified Bootloader (2)"
arch=('x86_64' 'i686')
@@ -178,15 +178,6 @@ _build_grub-efi() {
unset LDFLAGS
unset MAKEFLAGS
- if [[ "${_EFI_ARCH}" == "i386" ]]; then
- msg "Fix duplicate symbol"
- # http://savannah.gnu.org/bugs/?func=detailitem&item_id=53517
- sed '/i386 = lib\/i386\/reboot.c;/d' -i "grub-core/Makefile.core.def"
- sed '/i386 = lib\/i386\/reboot_trampoline.S;/d' -i "grub-core/Makefile.core.def"
- msg "Run autogen.sh for ${_EFI_ARCH} efi build"
- ./autogen.sh
- fi
-
msg "Run ./configure for ${_EFI_ARCH} efi build"
./configure \
--with-platform="efi" \