Fix master branch breakage with GCC8

3 files changed, 23 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2e095ca27457..5031ca9c90d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sat Nov 25 14:16:59 UTC 2017
 pkgbase = coreboot-utils-git
 	pkgdesc = Tools and utilities to work with coreboot firmware
-	pkgver = 4.6.r2177.g73add175cd
+	pkgver = 4.7.r1121.g40e6d2ebbd9
 	pkgrel = 1
 	url = https://www.coreboot.org/
 	arch = i686
@@ -15,9 +13,11 @@ pkgbase = coreboot-utils-git
 	source = git+https://review.coreboot.org/coreboot
 	source = git+https://review.coreboot.org/vboot
 	source = https://raw.githubusercontent.com/corna/me_cleaner/312ef02714dcab806c9d9bfee07f51002dc61e08/me_cleaner.py
+	source = buff_size_fix.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = f27ddd0fa26c121221dc8f76b71bf308d6d7c48fdc4d84968580d04c5dc2e42e
+	sha256sums = 0ab673cf5cfba4678cf7a7d567745742121cd921c4ab86081d4a9583ed679753
 
 pkgname = coreboot-utils-git
 
diff --git a/PKGBUILD b/PKGBUILD
index c7f02c7fd728..4e36da5bdbf6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Iru Cai <mytbk920423@gmail.com>
 
 pkgname=coreboot-utils-git
-pkgver=4.6.r2177.g73add175cd
+pkgver=4.7.r1121.g40e6d2ebbd9
 pkgrel=1
 pkgdesc='Tools and utilities to work with coreboot firmware'
 url='https://www.coreboot.org/'
@@ -14,10 +14,12 @@ makedepends=(git)
 source=(git+https://review.coreboot.org/coreboot
         # vboot provides vb2_api.h needed by cbfstool
         git+https://review.coreboot.org/vboot
-        https://raw.githubusercontent.com/corna/me_cleaner/312ef02714dcab806c9d9bfee07f51002dc61e08/me_cleaner.py)
+        https://raw.githubusercontent.com/corna/me_cleaner/312ef02714dcab806c9d9bfee07f51002dc61e08/me_cleaner.py
+	buff_size_fix.patch)
 sha256sums=('SKIP'
             'SKIP'
-            'f27ddd0fa26c121221dc8f76b71bf308d6d7c48fdc4d84968580d04c5dc2e42e')
+            'f27ddd0fa26c121221dc8f76b71bf308d6d7c48fdc4d84968580d04c5dc2e42e'
+            '0ab673cf5cfba4678cf7a7d567745742121cd921c4ab86081d4a9583ed679753')
 
 BUILD_AUTOPORT=y
 
@@ -37,6 +39,8 @@ prepare() {
   git config -f .gitmodules 'submodule.vboot.url' "$srcdir/vboot"
   git submodule sync -- 3rdparty/vboot
   git submodule update -- 3rdparty/vboot
+
+  patch -p1 < ../buff_size_fix.patch
 }
 
 build() {
diff --git a/buff_size_fix.patch b/buff_size_fix.patch
new file mode 100644
index 000000000000..e54517cdf10b
--- /dev/null
+++ b/buff_size_fix.patch
@@ -0,0 +1,13 @@
+diff --git a/util/romcc/romcc.c b/util/romcc/romcc.c
+index 9a7d1a2ff61..9e948483899 100644
+--- a/util/romcc/romcc.c
++++ b/util/romcc/romcc.c
+@@ -3629,7 +3629,7 @@ static void register_builtin_macro(struct compile_state *state,
+ 
+ static void register_builtin_macros(struct compile_state *state)
+ {
+-	char buf[30];
++	char buf[32];
+ 	char scratch[30];
+ 	time_t now;
+ 	struct tm *tm;