diff options
| author | root <root@rshg054.dnsready.net> | 2013-03-17 00:30:56 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-03-17 00:30:56 -0700 |
| commit | 993f2994ae292cae095a0282520680c33d92af5b (patch) | |
| tree | 9784eadc28df639d1dd02269687e7c9d0e5bc595 /extra/gnu-efi-libs | |
| parent | ea60830c19f04f36803e26821bd9db1361489653 (diff) | |
Sun Mar 17 00:30:56 PDT 2013
Diffstat (limited to 'extra/gnu-efi-libs')
| -rw-r--r-- | extra/gnu-efi-libs/PKGBUILD | 24 | ||||
| -rw-r--r-- | extra/gnu-efi-libs/disable-ms_abi-flag.patch | 4 |
2 files changed, 11 insertions, 17 deletions
diff --git a/extra/gnu-efi-libs/PKGBUILD b/extra/gnu-efi-libs/PKGBUILD index b7d60a78b..f6d0c4c42 100644 --- a/extra/gnu-efi-libs/PKGBUILD +++ b/extra/gnu-efi-libs/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 176034 2013-01-26 17:25:00Z tpowa $ +# $Id: PKGBUILD 180092 2013-03-16 15:44:29Z 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> _pkgver="3.0" pkgname="gnu-efi-libs" -pkgver="${_pkgver}s" -pkgrel="3" +pkgver="${_pkgver}t" +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,10 +19,8 @@ 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 - disable-ms_abi-flag.patch) - +source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz" + 'disable-ms_abi-flag.patch') _build_gnu-efi-libs-x86_64() { cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-x86_64" cd "${srcdir}/gnu-efi-${_pkgver}-x86_64/" @@ -39,8 +37,6 @@ _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 # 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 @@ -56,14 +52,14 @@ build() { _package_gnu-efi-libs-x86_64() { cd "${srcdir}/gnu-efi-${_pkgver}-x86_64/" - make ARCH="x86_64" INSTALLROOT="${pkgdir}/usr/" LIBDIR="lib" install + make ARCH="x86_64" PREFIX="" INSTALLROOT="${pkgdir}/usr/" LIBDIR="lib" install install -d "${pkgdir}/usr/share/gnu-efi/x86_64/" install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}-x86_64/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/x86_64/" } _package_gnu-efi-libs-i386() { cd "${srcdir}/gnu-efi-${_pkgver}-i386/" - make ARCH="ia32" INSTALLROOT="${pkgdir}/usr/" LIBDIR="${_LIBDIR32}" install + make ARCH="ia32" PREFIX="" INSTALLROOT="${pkgdir}/usr/" LIBDIR="${_LIBDIR32}" install install -d "${pkgdir}/usr/share/gnu-efi/i386/" install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}-i386/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/i386/" } @@ -79,7 +75,5 @@ package() { _package_gnu-efi-libs-i386 fi } - -md5sums=('11f63d52071f7382f56c9e81d0aece91' - '4b5428c51af1981d3eb158d924d6bf85' - '6295a103438cace5c40606b083c739fd') +md5sums=('95916208cf543699799230ac1ea14272' + '783755e5f691f4c5c629f94d759b727b') diff --git a/extra/gnu-efi-libs/disable-ms_abi-flag.patch b/extra/gnu-efi-libs/disable-ms_abi-flag.patch index 2fb61a1d7..e363e6481 100644 --- a/extra/gnu-efi-libs/disable-ms_abi-flag.patch +++ b/extra/gnu-efi-libs/disable-ms_abi-flag.patch @@ -6,8 +6,8 @@ index 38da180..aa1f4de 100644 CPPFLAGS = -DCONFIG_$(ARCH) ifeq ($(GCCNEWENOUGH),1) --CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args -+CPPFLAGS += -maccumulate-outgoing-args +-CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11 ++CPPFLAGS += -maccumulate-outgoing-args --std=c11 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 |