upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 7 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 9f97b73..fd4680b 100644
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,10 @@
11ROOT := $(shell pwd) 11ROOT := $(shell pwd)
12NPROC := $(shell nproc 2>/dev/null || echo 2) 12NPROC := $(shell nproc 2>/dev/null || echo 2)
13SUDO := $(shell [ "$$(id -u)" = "0" ] && echo "" || echo "sudo") 13SUDO := $(shell [ "$$(id -u)" = "0" ] && echo "" || echo "sudo")
14# Not "1.2.19". This tree is upstream v1.2.19 plus our own hardening commits and 14# Not "1.2.20". This tree is upstream v1.2.20 plus our own hardening commits and
15# a hand-merged payout ledger, so a binary built here must not be mistakable for 15# a hand-merged payout ledger, so a binary built here must not be mistakable for
16# the upstream release of that number -- it names every release artifact. 16# the upstream release of that number -- it names every release artifact.
17VERSION := 1.2.19+sec 17VERSION := 1.2.20+sec
18 18
19# ---- Pinned third-party sources ------------------------------------------- 19# ---- Pinned third-party sources -------------------------------------------
20# 20#
@@ -82,10 +82,11 @@ deps-apt:
82 @if command -v apt-get >/dev/null 2>&1; then \ 82 @if command -v apt-get >/dev/null 2>&1; then \
83 $(SUDO) apt-get install -y build-essential cmake git pkg-config autoconf \ 83 $(SUDO) apt-get install -y build-essential cmake git pkg-config autoconf \
84 libtool libssl-dev libdb5.3++-dev libsodium-dev nlohmann-json3-dev \ 84 libtool libssl-dev libdb5.3++-dev libsodium-dev nlohmann-json3-dev \
85 libboost-system-dev libglfw3-dev libgl-dev python3-pil clang; \ 85 libboost-system-dev libglfw3-dev libgl-dev libsqlite3-dev \
86 python3-pil clang; \
86 else \ 87 else \
87 echo "Not an apt system — install: g++ cmake git autoconf libtool"; \ 88 echo "Not an apt system — install: g++ cmake git autoconf libtool"; \
88 echo " libssl libdb++ libsodium nlohmann-json boost glfw3 opengl python3-pil"; \ 89 echo " libssl libdb++ libsodium nlohmann-json boost glfw3 opengl sqlite3 python3-pil"; \
89 fi 90 fi
90 91
91deps-secp256k1: 92deps-secp256k1:
@@ -172,7 +173,7 @@ img = ico.convert('RGBA'); \
172img.save(d + '/bitflash.png'); \ 173img.save(d + '/bitflash.png'); \
173import shutil; shutil.copy(d + '/bitflash.png', \ 174import shutil; shutil.copy(d + '/bitflash.png', \
174d + '/usr/share/icons/hicolor/256x256/apps/bitflash.png')" 175d + '/usr/share/icons/hicolor/256x256/apps/bitflash.png')"
175 @for lib in libsodium.so.23 libdb_cxx-5.3.so libglfw.so.3; do \ 176 @for lib in libsodium.so.23 libdb_cxx-5.3.so libsqlite3.so.0 libglfw.so.3; do \
176 path=$$(ldconfig -p | grep " $$lib " | awk '{print $$NF}' | head -1); \ 177 path=$$(ldconfig -p | grep " $$lib " | awk '{print $$NF}' | head -1); \
177 [ -z "$$path" ] && path=$$(find /usr/lib /lib -name "$$lib" 2>/dev/null | head -1); \ 178 [ -z "$$path" ] && path=$$(find /usr/lib /lib -name "$$lib" 2>/dev/null | head -1); \
178 [ -n "$$path" ] && cp -L "$$path" $(APPDIR)/usr/lib/ && echo " bundled $$lib" || echo " missing $$lib"; \ 179 [ -n "$$path" ] && cp -L "$$path" $(APPDIR)/usr/lib/ && echo " bundled $$lib" || echo " missing $$lib"; \
@@ -190,6 +191,7 @@ deps-windows:
190 mingw-w64-ucrt-x86_64-glfw \ 191 mingw-w64-ucrt-x86_64-glfw \
191 mingw-w64-ucrt-x86_64-openssl \ 192 mingw-w64-ucrt-x86_64-openssl \
192 mingw-w64-ucrt-x86_64-db \ 193 mingw-w64-ucrt-x86_64-db \
194 mingw-w64-ucrt-x86_64-sqlite3 \
193 mingw-w64-ucrt-x86_64-libsodium \ 195 mingw-w64-ucrt-x86_64-libsodium \
194 mingw-w64-ucrt-x86_64-nlohmann-json \ 196 mingw-w64-ucrt-x86_64-nlohmann-json \
195 mingw-w64-ucrt-x86_64-boost \ 197 mingw-w64-ucrt-x86_64-boost \