fix build with gcc10

3 files changed, 22 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 58d8c3c40d8f..3d3a723eb05d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,7 +10,9 @@ pkgbase = mongrel2
 	depends = sqlite3
 	depends = zeromq
 	source = https://github.com/mongrel2/mongrel2/releases/download/v1.12.2/mongrel2-v1.12.2.tar.bz2
+	source = extern-m2program.patch
 	sha256sums = 3bffeae198c37a1efc9c12f77d5f1eb61cdf62b35d661babc2527dd030aa7d8f
+	sha256sums = 3a7a592fb6691e8d0a360cf17fe4af7abf779cb36250cb7b2a2b466d3c723a23
 
 pkgname = mongrel2
 
diff --git a/PKGBUILD b/PKGBUILD
index e9a6694f25eb..8f5acaceea6c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,8 +11,15 @@ license=('BSD')
 arch=("i686" "x86_64")
 depends=('sqlite3' 'zeromq')
 makedepends=('git')
-source=("https://github.com/mongrel2/mongrel2/releases/download/v$pkgver/$pkgname-v$pkgver.tar.bz2")
-sha256sums=('3bffeae198c37a1efc9c12f77d5f1eb61cdf62b35d661babc2527dd030aa7d8f')
+source=("https://github.com/mongrel2/mongrel2/releases/download/v$pkgver/$pkgname-v$pkgver.tar.bz2"
+        "extern-m2program.patch")
+sha256sums=('3bffeae198c37a1efc9c12f77d5f1eb61cdf62b35d661babc2527dd030aa7d8f'
+            '3a7a592fb6691e8d0a360cf17fe4af7abf779cb36250cb7b2a2b466d3c723a23')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-v${pkgver}"
+  patch -Np1 -i "${srcdir}/extern-m2program.patch"
+}
 
 build() {
   cd "${srcdir}/${pkgname}-v${pkgver}"
diff --git a/extern-m2program.patch b/extern-m2program.patch
new file mode 100644
index 000000000000..1232eedf75df
--- /dev/null
+++ b/extern-m2program.patch
@@ -0,0 +1,11 @@
+--- a/src/unixy.h	2020-07-17 14:37:50.273848775 -0400
++++ b/src/unixy.h	2020-07-17 14:41:17.922678562 -0400
+@@ -38,7 +38,7 @@
+ #include <bstring.h>
+ #include <unistd.h>
+ 
+-char *m2program;
++extern char *m2program;
+ 
+ int Unixy_chroot(bstring path);
+