Mon Jun 24 00:07:29 PDT 2013

1 files changed, 31 insertions, 63 deletions

diff --git a/extra/gnu-efi-libs/PKGBUILD b/extra/gnu-efi-libs/PKGBUILD
index f6d0c4c42..7c7d3f940 100644
--- a/extra/gnu-efi-libs/PKGBUILD
+++ b/extra/gnu-efi-libs/PKGBUILD
@@ -1,79 +1,47 @@
-# $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: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 _pkgver="3.0"
 pkgname="gnu-efi-libs"
-pkgver="${_pkgver}t"
+pkgver="${_pkgver}u"
 pkgrel="2"
-pkgdesc="Library for building x86_64 and i386 UEFI Applications using GNU toolchain"
+pkgdesc="Library for building UEFI Applications using GNU toolchain"
 url="http://sourceforge.net/projects/gnu-efi/"
 license=('GPL')
-arch=('i686' 'x86_64')
-makedepends=('pciutils')
-if [[ "${CARCH}" == "x86_64" ]]; then
-	makedepends+=('lib32-glibc')
-fi
-conflicts=('gnu-efi')
-provides=('gnu-efi')
-replaces=('gnu-efi')
+arch=('x86_64' 'i686')
 options=('!strip' '!makeflags')
-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/"
-	ARCH="x86_64" make
-	ARCH="x86_64" make -C apps all	
-}
+makedepends=('pciutils')
 
-_build_gnu-efi-libs-i386() {
-	cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-i386"
-	cd "${srcdir}/gnu-efi-${_pkgver}-i386/"	
-	ARCH="ia32" make
-	ARCH="ia32" make -C apps all	
-}
+source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz")
+md5sums=('d15d3c700e79a1e2938544d73edc572d')
 
-build() {
-        cd ${srcdir}/gnu-efi-${_pkgver}
-        # 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
-	sed 's|ARCH	   :=|ARCH	   ?=|g' -i Make.defaults
-	sed 's|-fno-strict-aliasing|-fno-strict-aliasing -fno-stack-protector|g' -i Make.defaults
-	if [[ "${CARCH}" == "x86_64" ]]; then
-		_build_gnu-efi-libs-x86_64
-	fi
-	_build_gnu-efi-libs-i386	
-}
-
-_package_gnu-efi-libs-x86_64() {
-	cd "${srcdir}/gnu-efi-${_pkgver}-x86_64/"	
-	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/"
-}
+[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
+[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="ia32"
 
-_package_gnu-efi-libs-i386() {	
-	cd "${srcdir}/gnu-efi-${_pkgver}-i386/"
-	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/"	
+build() {
+	
+	cd "${srcdir}/gnu-efi-${_pkgver}/"
+	
+	## Unset all compiler FLAGS
+	unset CFLAGS
+	unset CPPFLAGS
+	unset CXXFLAGS
+	unset LDFLAGS
+	unset MAKEFLAGS
+	
+	make -j1
+	make -j1 -C apps all
+	
 }
 
 package() {
-	if [[ "${CARCH}" == "x86_64" ]]; then
-		_package_gnu-efi-libs-x86_64
-		
-		_LIBDIR32="lib32"
-		_package_gnu-efi-libs-i386
-	else
-		_LIBDIR32="lib"
-		_package_gnu-efi-libs-i386
-	fi	
+	
+	cd "${srcdir}/gnu-efi-${_pkgver}/"
+	
+	make INSTALLROOT="${pkgdir}" PREFIX="/usr" LIBDIR="/usr/lib" install
+	
+	install -d "${pkgdir}/usr/share/gnu-efi/apps/${_EFI_ARCH}/"
+	install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/apps/${_EFI_ARCH}/"
+	
 }
-md5sums=('95916208cf543699799230ac1ea14272'
-         '783755e5f691f4c5c629f94d759b727b')