diff options
| author | Casey Marshall <casey.marshall@canonical.com> | 2016-09-11 18:14:38 -0500 |
|---|---|---|
| committer | Casey Marshall <casey.marshall@canonical.com> | 2016-09-11 18:14:38 -0500 |
| commit | 823843eadb38ab84cac55d260c9394565af2a3dd (patch) | |
| tree | 4eb050b586cad3aace6fd6bdf5893cd19306b632 | |
| parent | Add snap packaging. (diff) | |
| download | monero-823843eadb38ab84cac55d260c9394565af2a3dd.tar.xz | |
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.
| -rwxr-xr-x | contrib/snap/daemon.bash | 1 | ||||
| -rwxr-xr-x | contrib/snap/wallet.bash | 1 | ||||
| -rw-r--r-- | snapcraft.yaml | 9 |
3 files changed, 11 insertions, 0 deletions
diff --git a/contrib/snap/daemon.bash b/contrib/snap/daemon.bash index dfbf5e3f6..41d1275de 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 04aa6c525..004f1371e 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 89004f62d..203789413 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 |