From 823843eadb38ab84cac55d260c9394565af2a3dd Mon Sep 17 00:00:00 2001
From: Casey Marshall <casey.marshall@canonical.com>
Date: Sun, 11 Sep 2016 18:14:38 -0500
Subject: [PATCH] Fix portability issues discovered with fresh snap install.

ARCH=native fixes SIGILL issues on other amd64 processors.
Static library dependencies where supported.
Package libunbound2 in the snap.
---
 contrib/snap/daemon.bash | 1 +
 contrib/snap/wallet.bash | 1 +
 snapcraft.yaml           | 9 +++++++++
 3 files changed, 11 insertions(+)

diff --git a/contrib/snap/daemon.bash b/contrib/snap/daemon.bash
index dfbf5e3f..41d1275d 100755
--- a/contrib/snap/daemon.bash
+++ b/contrib/snap/daemon.bash
@@ -1,5 +1,6 @@
 #!/bin/bash -e
 
+export LD_LIBRARY_PATH=${SNAP_LIBRARY_PATH}:${SNAP}/usr/lib/x86_64-linux-gnu
 export HOME=${SNAP_DATA}
 cd ${SNAP_DATA}
 
diff --git a/contrib/snap/wallet.bash b/contrib/snap/wallet.bash
index 04aa6c52..004f1371 100755
--- a/contrib/snap/wallet.bash
+++ b/contrib/snap/wallet.bash
@@ -1,5 +1,6 @@
 #!/bin/bash -e
 
+export LD_LIBRARY_PATH=${SNAP_LIBRARY_PATH}:${SNAP}/usr/lib/x86_64-linux-gnu
 export HOME=${SNAP_USER_DATA}
 cd ${SNAP_USER_DATA}
 
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 89004f62..20378941 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -42,6 +42,12 @@ parts:
  
     cmake-build:
         plugin: cmake
+        configflags:
+            - -DBDB_STATIC=1
+            - -DUPNP_STATIC=1
+            - -DBoost_USE_STATIC_LIBS=1
+            - -DBoost_USE_STATIC_RUNTIME=1
+            - -DARCH=default
         source: .
         build-packages:
             - gcc
@@ -58,5 +64,8 @@ parts:
             - bison
             - doxygen
             - graphviz
+        stage-packages:
+            - libunbound2
         snap:
             - bin
+            - usr