Fix compilation of libbacktrace

4 files changed, 41 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8fd8e0537b8f..6be7c14fb449 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = c-lightning-git
 	pkgdesc = A Lightning Network implementation in C
-	pkgver = r2229.77497b52
+	pkgver = r2936.b3534462
 	pkgrel = 1
 	url = https://github.com/ElementsProject/lightning
 	arch = i686
@@ -10,12 +10,16 @@ pkgbase = c-lightning-git
 	depends = sqlite
 	source = git+https://github.com/ElementsProject/lightning.git
 	source = git+https://github.com/zserge/jsmn.git
+	source = git+https://github.com/ianlancetaylor/libbacktrace.git
 	source = git+https://github.com/bitcoin/libbase58.git
 	source = git+https://github.com/jedisct1/libsodium.git
+	source = libbacktrace-no-multilib.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = 5f843b31b1be859994413a826d8814c6d3ea29d99d8ea59d2372d8a1f3ba036f
 
 pkgname = c-lightning-git
 
diff --git a/.gitignore b/.gitignore
index d8f35b299330..06b9f9e38648 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /*.pkg.tar.*
 /jsmn/
+/libbacktrace/
 /libbase58/
 /libsodium/
 /lightning/
diff --git a/PKGBUILD b/PKGBUILD
index 20f76e2d3e80..353d568bfc70 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Nicola Squartini <tensor5@gmail.com>
 
 pkgname=c-lightning-git
-pkgver=r2229.77497b52
+pkgver=r2936.b3534462
 pkgrel=1
 pkgdesc='A Lightning Network implementation in C'
 arch=('i686' 'x86_64')
@@ -11,12 +11,16 @@ depends=('sqlite')
 makedepends=('git')
 source=('git+https://github.com/ElementsProject/lightning.git'
         'git+https://github.com/zserge/jsmn.git'
+        'git+https://github.com/ianlancetaylor/libbacktrace.git'
         'git+https://github.com/bitcoin/libbase58.git'
-        'git+https://github.com/jedisct1/libsodium.git')
+        'git+https://github.com/jedisct1/libsodium.git'
+        'libbacktrace-no-multilib.patch')
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
-            'SKIP')
+            'SKIP'
+            'SKIP'
+            '5f843b31b1be859994413a826d8814c6d3ea29d99d8ea59d2372d8a1f3ba036f')
 
 pkgver() {
     cd lightning
@@ -30,18 +34,31 @@ prepare() {
     git submodule init external/jsmn
     git config submodule.daemon/jsmn.url "${srcdir}/jsmn"
 
+    git submodule init external/libbacktrace
+    git config submodule.external/libbacktrace.url "${srcdir}/libbacktrace"
+
     git submodule init external/libbase58
     git config submodule.bitcoin/libbase58.url "${srcdir}/libbase58"
 
     git submodule init external/libsodium
     git config submodule.libsodium.url "${srcdir}/libsodium"
 
+    git submodule update
     sed -e 's/ -Werror//' -i Makefile
+    cd external/libbacktrace
+    patch -p1 -i "${srcdir}/libbacktrace-no-multilib.patch"
 }
 
 build() {
     cd lightning
 
+    cd external/libbacktrace
+    #rm aclocal.m4 *.in configure ltmain.sh
+    #aclocal && libtoolize --force && autoreconf
+    autoreconf --force --install
+    #libtoolize --force
+    cd ../..
+
     make
 }
 
diff --git a/libbacktrace-no-multilib.patch b/libbacktrace-no-multilib.patch
new file mode 100644
index 000000000000..75e863a500c3
--- /dev/null
+++ b/libbacktrace-no-multilib.patch
@@ -0,0 +1,15 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,9 +35,9 @@
+ AC_CONFIG_HEADER(config.h)
+ 
+ # with_target_subdir is used when configured as part of a GCC tree.
+-if test -n "${with_target_subdir}"; then
+-  AM_ENABLE_MULTILIB(, ..)
+-fi
++#if test -n "${with_target_subdir}"; then
++#  AM_ENABLE_MULTILIB(, ..)
++#fi
+ 
+ AC_CANONICAL_SYSTEM
+ target_alias=${target_alias-$host_alias}