fixed gcc-6.0 issues

Signed-off-by: Mark Weiman <mark.weiman@markzz.com>

3 files changed, 24 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c4debd8e85b3..30ecc1f9dc59 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Mar 28 04:09:19 UTC 2016
+# Fri May 20 17:30:52 UTC 2016
 pkgbase = ovmf-git
 	pkgdesc = UEFI Firmware (OVMF) with Secure Boot Support - for Virtual Machines (QEMU) - from Tianocore EDK2 - GIT Version
-	pkgver = 18129.877c0a9
+	pkgver = 18726.edddb94
 	pkgrel = 1
 	url = https://tianocore.github.io/ovmf/
 	install = ovmf.install
@@ -25,8 +25,10 @@ pkgbase = ovmf-git
 	options = !makeflags
 	source = edk2::git+https://github.com/tianocore/edk2.git#branch=master
 	source = https://www.openssl.org/source/openssl-1.0.2g.tar.gz
+	source = gcc-6.0.patch
 	sha1sums = SKIP
 	sha1sums = 36af23887402a5ea4ebef91df8e61654906f58f2
+	sha1sums = e90e571e5ee2456bbd4c6a90696d0f440d6a0f69
 
 pkgname = ovmf-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 9948bbb598c8..acd92024c389 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer : Mark Weiman <mark dot weiman at markzz dot com>
+# Contributor: David Hummel <dhummel at eml dot cc>
 # Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Contributor: Andre Osku Schmidt (oskude) <(andre.osku.schmidt) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
@@ -25,7 +26,7 @@ _OPENSSL_VERSION="1.0.2g"
 _pkgname="ovmf"
 pkgname="${_pkgname}-git"
 
-pkgver=18129.877c0a9
+pkgver=18726.edddb94
 pkgrel=1
 pkgdesc="UEFI Firmware (OVMF) with Secure Boot Support - for Virtual Machines (QEMU) - from Tianocore EDK2 - GIT Version"
 url="https://tianocore.github.io/ovmf/"
@@ -42,10 +43,12 @@ provides=('ovmf' 'ovmf-bin' 'ovmf-svn')
 install="${_pkgname}.install"
 
 source=("${_TIANO_DIR_}::git+https://github.com/tianocore/edk2.git#branch=master"
-        "https://www.openssl.org/source/openssl-${_OPENSSL_VERSION}.tar.gz")
+        "https://www.openssl.org/source/openssl-${_OPENSSL_VERSION}.tar.gz"
+        "gcc-6.0.patch")
 
 sha1sums=('SKIP'
-          '36af23887402a5ea4ebef91df8e61654906f58f2')
+          '36af23887402a5ea4ebef91df8e61654906f58f2'
+          'e90e571e5ee2456bbd4c6a90696d0f440d6a0f69')
 
 noextract=("openssl-${_OPENSSL_VERSION}.tar.gz")
 
@@ -126,6 +129,9 @@ _prepare_openssl_udk_dir() {
 }
 
 prepare() {
+
+  # Fixes build when using gcc-6.0+
+  patch -Np0 -i gcc-6.0.patch
 	
 	_bail_out
 	
diff --git a/gcc-6.0.patch b/gcc-6.0.patch
new file mode 100644
index 000000000000..0b6fcddc3555
--- /dev/null
+++ b/gcc-6.0.patch
@@ -0,0 +1,11 @@
+--- edk2/OvmfPkg/build.sh.old	2016-05-20 13:19:44.721457791 -0400
++++ edk2/OvmfPkg/build.sh	2016-05-20 13:18:36.334073093 -0400
+@@ -95,7 +95,7 @@ case `uname` in
+       4.8.*)
+         TARGET_TOOLS=GCC48
+         ;;
+-      4.9.*|4.1[0-9].*|5.*.*)
++      4.9.*|4.1[0-9].*|5.*.*|6.*.*)
+         TARGET_TOOLS=GCC49
+         ;;
+       *)