diff options
| author | root <root@rshg054.dnsready.net> | 2012-11-13 01:32:19 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-11-13 01:32:19 -0800 |
| commit | a29329c38e50afd28d28c3a99e35d8774b9b19f8 (patch) | |
| tree | 42f4b2e44d0f2fcce6dff4f44ba48e623437b16e /extra/gnu-efi-libs | |
| parent | b863c91c6c9218e2ad9458231b24385be177ed08 (diff) | |
Tue Nov 13 01:32:13 PST 2012
Diffstat (limited to 'extra/gnu-efi-libs')
| -rw-r--r-- | extra/gnu-efi-libs/PKGBUILD | 17 | ||||
| -rw-r--r-- | extra/gnu-efi-libs/disable-ms_abi-flag.patch | 16 |
2 files changed, 26 insertions, 7 deletions
diff --git a/extra/gnu-efi-libs/PKGBUILD b/extra/gnu-efi-libs/PKGBUILD index 45a40216f..6432177d1 100644 --- a/extra/gnu-efi-libs/PKGBUILD +++ b/extra/gnu-efi-libs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 170405 2012-11-07 10:31:11Z tpowa $ +# $Id: PKGBUILD 170836 2012-11-12 13:59:20Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer : Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> @@ -6,7 +6,7 @@ _pkgver="3.0" pkgname="gnu-efi-libs" pkgver="${_pkgver}s" -pkgrel="1" +pkgrel="2" pkgdesc="Library for building x86_64 and i386 UEFI Applications using GNU toolchain" url="http://sourceforge.net/projects/gnu-efi/" license=('GPL') @@ -19,7 +19,9 @@ conflicts=('gnu-efi') provides=('gnu-efi') replaces=('gnu-efi') options=('!strip' '!makeflags') -source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz" gnu-efi-libs-x86_64-call-fix.patch) +source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz" + gnu-efi-libs-x86_64-call-fix.patch + disable-ms_abi-flag.patch) _build_gnu-efi-libs-x86_64() { cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-x86_64" @@ -38,7 +40,9 @@ _build_gnu-efi-libs-i386() { build() { cd ${srcdir}/gnu-efi-${_pkgver} # fix http://sourceforge.net/tracker/?func=detail&aid=3576537&group_id=163609&atid=828423 - patch -Np1 -i ../gnu-efi-libs-x86_64-call-fix.patch + patch -Np1 -i ../gnu-efi-libs-x86_64-call-fix.patch + # fix broken ms_abi flags, causing weird issues with bootloaders + patch -Np1 -i ../disable-ms_abi-flag.patch ## Fix Makefiles to enable compile for both UEFI arch sed 's|INSTALLROOT=/usr/local|INSTALLROOT ?= /usr/lib|g' -i Make.defaults sed 's|LIBDIR=lib|LIBDIR ?= lib|g' -i Make.defaults @@ -75,7 +79,6 @@ package() { _package_gnu-efi-libs-i386 fi } -md5sums=('c5081850414bec34d3e254e8e970811b' - '4b5428c51af1981d3eb158d924d6bf85') md5sums=('11f63d52071f7382f56c9e81d0aece91' - '4b5428c51af1981d3eb158d924d6bf85') + '4b5428c51af1981d3eb158d924d6bf85' + '6295a103438cace5c40606b083c739fd') diff --git a/extra/gnu-efi-libs/disable-ms_abi-flag.patch b/extra/gnu-efi-libs/disable-ms_abi-flag.patch new file mode 100644 index 000000000..2fb61a1d7 --- /dev/null +++ b/extra/gnu-efi-libs/disable-ms_abi-flag.patch @@ -0,0 +1,16 @@ +diff --git a/Make.defaults b/Make.defaults +index 38da180..aa1f4de 100644 +--- a/Make.defaults ++++ b/Make.defaults +@@ -54,9 +54,9 @@ GCCNEWENOUGH := $(shell ([ $(GCCVERSION) -gt "4" ] || ([ $(GCCVERSION) -eq "4" ] + + CPPFLAGS = -DCONFIG_$(ARCH) + ifeq ($(GCCNEWENOUGH),1) +-CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args ++CPPFLAGS += -maccumulate-outgoing-args + endif +-CFLAGS = $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants ++CFLAGS = $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-stack-protector -fno-merge-constants + ASFLAGS = $(ARCH3264) + LDFLAGS = -nostdlib + INSTALL = install |