From 7e55558944d2ae6002a6742464171f865a483b57 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.eu>
Date: Wed, 28 Mar 2018 11:20:50 +0200
Subject: [PATCH] common/xbps-src: add stacktraces on build errors

---
 common/xbps-src/shutils/common.sh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index 8091319902..ac4337cb33 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -80,9 +80,18 @@ run_step() {
 }
 
 error_func() {
-    if [ -n "$1" -a -n "$2" ]; then
-        msg_red "$pkgver: failed to run $1() at line $2.\n"
-    fi
+    local err=$?
+    local src=
+    local i=
+    [ -n "$1" -a -n "$2" ] || exit 1;
+
+    msg_red "$pkgver: $1: '${BASH_COMMAND}' exited with $err\n"
+    for ((i=1;i<${#FUNCNAME[@]};i++)); do
+        src=${BASH_SOURCE[$i]}
+        src=${src#$XBPS_DISTDIR/}
+        msg_red "  in ${FUNCNAME[$i]}() at $src:${BASH_LINENO[$i-1]}\n"
+        [ "${FUNCNAME[$i]}" = "$1" ] && break;
+    done
     exit 1
 }