Fix strarg.h issue

2 files changed, 40 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c30e21e90e2..4779c1ed8c7c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gnu-efi-libs-git
 	pkgdesc = Library for building UEFI Applications using GNU toolchain - Sourceforge GIT Version
-	pkgver = 0.43.f16d93f
+	pkgver = 3.0v.43.f16d93f
 	pkgrel = 1
 	url = http://sourceforge.net/projects/gnu-efi/
 	arch = x86_64
@@ -8,7 +8,7 @@ pkgbase = gnu-efi-libs-git
 	license = GPL
 	makedepends = git
 	makedepends = pciutils
-	provides = gnu-efi-libs
+	provides = gnu-efi-libs=3.0v.43.f16d93f
 	conflicts = gnu-efi-libs
 	options = staticlibs
 	options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index 6d11d38d3afa..f3c9b2649d09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,20 @@
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
-_gitroot="http://git.code.sf.net/p/gnu-efi/code"
-_gitname="gnu-efi"
-_gitbranch="master"
+[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
+[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="ia32"
+
+__pkgname="gnu-efi"
 
-_src_rootdir="${_gitname}-3.0"
+_src_rootdir="${__pkgname}-3.0"
 
-pkgname="gnu-efi-libs-git"
-pkgver=0.43.f16d93f
+_pkgname="gnu-efi-libs"
+pkgname="${_pkgname}-git"
+
+_pkgver="3.0v"
+pkgver=3.0v.43.f16d93f
 pkgrel=1
+
 pkgdesc="Library for building UEFI Applications using GNU toolchain - Sourceforge GIT Version"
 url="http://sourceforge.net/projects/gnu-efi/"
 license=('GPL')
@@ -19,47 +24,56 @@ makedepends=('git' 'pciutils')
 options=('staticlibs' '!strip' '!makeflags')
 
 conflicts=('gnu-efi-libs')
-provides=('gnu-efi-libs')
+provides=("gnu-efi-libs=${pkgver}")
 
-source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}"
+source=("${__pkgname}::git+http://git.code.sf.net/p/gnu-efi/code#branch=master"
         'gnu-efi-3.0v-revert-makefile-commit.patch')
 
 sha1sums=('SKIP'
           'db411a1f2f545924dc59f8a0c2331acfcb10bb54')
 
 pkgver() {
-	cd "${srcdir}/${_gitname}/"
-	echo "0.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" | sed -e 's|-|.|g'
+	cd "${srcdir}/${__pkgname}/"
+	echo "${_pkgver}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" | sed -e 's|-|.|g'
 }
 
-[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
-[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="ia32"
-
-build() {
-	rm -rf "${srcdir}/${_gitname}_build/" || true
-	cp -r "${srcdir}/${_gitname}" "${srcdir}/${_gitname}_build"
+prepare() {
 	
-	cd "${srcdir}/${_gitname}_build/"
+	rm -rf "${srcdir}/${__pkgname}_build/" || true
+	cp -r "${srcdir}/${__pkgname}" "${srcdir}/${__pkgname}_build"
 	
+	cd "${srcdir}/${__pkgname}_build/"
+	
+	msg "Clean git repo"
 	git clean -x -d -f
 	echo
 	
+	msg "Fix Makefiles"
 	# git revert --no-commit 06744d69273de4945cf0ffcaa4a6abf7cec707b6
 	patch -Np1 -i "${srcdir}/gnu-efi-3.0v-revert-makefile-commit.patch" || true
 	echo
 	
-	## Unset all compiler FLAGS
+	msg "Fix stdarg.h issue"
+	sed 's|#include "stdarg.h"|#include <stdarg.h>|g' -i "${srcdir}/${__pkgname}_build/${_src_rootdir}/inc/efistdarg.h" || true
+	
+}
+
+build() {
+	
+	cd "${srcdir}/${__pkgname}_build/${_src_rootdir}/"
+	
+	msg "Unset all compiler FLAGS"
 	unset CFLAGS
 	unset CPPFLAGS
 	unset CXXFLAGS
 	unset LDFLAGS
 	unset MAKEFLAGS
 	
-	cd "${srcdir}/${_gitname}_build/${_src_rootdir}/"
-	
+	msg "Run make"
 	make -j1
 	echo
 	
+	msg "Run make apps"
 	make -j1 -C apps all
 	echo
 	
@@ -67,12 +81,14 @@ build() {
 
 package() {
 	
-	cd "${srcdir}/${_gitname}_build/${_src_rootdir}/"
+	cd "${srcdir}/${__pkgname}_build/${_src_rootdir}/"
 	
+	msg "Run make install"
 	make INSTALLROOT="${pkgdir}" PREFIX="/usr" LIBDIR="/usr/lib" install
 	echo
 	
+	msg "Install gnu-efi apps"
 	install -d "${pkgdir}/usr/share/gnu-efi/apps/${_EFI_ARCH}/"
-	install -D -m0644 "${srcdir}/${_gitname}_build/${_src_rootdir}/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/apps/${_EFI_ARCH}/"
+	install -D -m0644 "${srcdir}/${__pkgname}_build/${_src_rootdir}/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/apps/${_EFI_ARCH}/"
 	
 }