From 70977a4fbd439ac701899502118358667d2ee92b Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 13 Nov 2020 10:27:38 +1030 Subject: [PATCH] libwally: update to latest which uses libsecp-zkp submodule And get rid of the now-obsolete PYTHON_VERSION hack. Signed-off-by: Rusty Russell --- external/Makefile | 8 ++------ external/libwally-core | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/external/Makefile b/external/Makefile index b6326ada4..368b201f7 100644 --- a/external/Makefile +++ b/external/Makefile @@ -67,14 +67,10 @@ $(TARGET_DIR)/libsecp256k1.% $(TARGET_DIR)/libwallycore.%: $(TARGET_DIR)/libwall $(MAKE) -C $(TARGET_DIR)/libwally-core-build DESTDIR=$$(pwd)/$(TARGET_DIR) install-exec # Build libwally-core. -# -# PYTHON_VERSION is required to prevent configure from complaining about -# missing python2 binaries. These have been removed in newer distros and we -# shouldn't require them to be present either. $(TARGET_DIR)/libwally-core-build/src/libwallycore.% $(TARGET_DIR)/libwally-core-build/src/secp256k1/libsecp256k1.%: $(LIBWALLY_HEADERS) $(LIBSECP_HEADERS) - cd external/libwally-core && ./tools/autogen.sh + cd external/libwally-core && git submodule init && git submodule update && ./tools/autogen.sh mkdir -p ${TARGET_DIR}/libwally-core-build - cd ${TARGET_DIR}/libwally-core-build && PYTHON_VERSION=3 CFLAGS=-std=c99 ${TOP}/libwally-core/configure CC="$(CC)" --enable-static=yes $(CROSSCOMPILE_OPTS) --enable-module-recovery --enable-elements --enable-shared=no --prefix=/ --libdir=/ --enable-debug && $(MAKE) + cd ${TARGET_DIR}/libwally-core-build && CFLAGS=-std=c99 ${TOP}/libwally-core/configure CC="$(CC)" --enable-static=yes $(CROSSCOMPILE_OPTS) --enable-module-recovery --enable-elements --enable-shared=no --prefix=/ --libdir=/ --enable-debug && $(MAKE) # If we tell Make that the above builds both, it runs it twice in # parallel. So we lie :( diff --git a/external/libwally-core b/external/libwally-core index b8d7ea910..bf81e8b17 160000 --- a/external/libwally-core +++ b/external/libwally-core @@ -1 +1 @@ -Subproject commit b8d7ea91049c3d5522768c77c8bfe4936cbabbd7 +Subproject commit bf81e8b17069020dec0638e352298770aa382952