Make it build on Debian.

BlockchainCommons · Feb 11, 2023 · 5a20247 · 5a20247
1 parent fe09167
commit 5a20247
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/build.sh b/build.sh
@@ -37,7 +37,7 @@ if [[ "$OSTYPE" == "msys" ]]; then
 # FIXME: figure out how to disable PTHREADS instead of tests
 ./configure "${WALLY_CONFIGURE-}" --disable-tests --disable-shared --prefix ${SYSROOT}
 else
-./configure "${WALLY_CONFIGURE-}" --disable-shared --prefix ${SYSROOT}
+./configure "${WALLY_CONFIGURE-}" --disable-tests --disable-shared --prefix ${SYSROOT}
 fi
 
 make

diff --git a/configure.ac b/configure.ac
@@ -3,6 +3,7 @@
 
 AC_PREREQ([2.69])
 AC_INIT([keytool-cli], [0.7.0])
+AC_CONFIG_AUX_DIR([/usr/share/autoconf/build-aux])
 AC_CONFIG_SRCDIR([src/keytool.cpp])
 AC_CONFIG_HEADERS([src/config.h])
 

diff --git a/src/Makefile.in b/src/Makefile.in
@@ -28,7 +28,7 @@ RESET=`tput sgr0`
 
 COMPILER = g++
 CFLAGS += --debug -O0
-CXXFLAGS += -std=c++17 -stdlib=libc++ --debug -O0
+CXXFLAGS += -std=c++17 --debug -O0
 
 toolname = keytool
 
@@ -80,7 +80,7 @@ LDLIBS += -lwallycore -lsecp256k1 -largp -lbc-ur
 
 UNAME := $(shell uname)
 ifeq ($(UNAME), Linux)
-    LDLIBS += -lm -lc++ -lc++abi -lgcc_s -lgcc
+    LDLIBS += -lm -lgcc_s -lgcc -lstdc++
 else ifeq ($(findstring MINGW64, $(UNAME)), MINGW64)
     # on windows building with msys2/mingw64
     LDLIBS += -lm -lc++ -lws2_32 -lssp

diff --git a/src/chain-type.hpp b/src/chain-type.hpp
@@ -4,6 +4,7 @@
 #include <optional>
 #include <string>
 #include <vector>
+#include <stdexcept>
 
 class ChainType final {
 public:

diff --git a/src/hd-key.hpp b/src/hd-key.hpp
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <optional>
+#include <limits>
 #include "utils.hpp"
 #include "use-info.hpp"
 #include "derivation-path.hpp"