aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-30 03:04:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

make: Explicitly set PYTHON_VERSION=3 for libwally

Browse Source 
Otherwise it can end up complaining that it can't find python2, which
we don't have listed as a dependency and is deprecated anyway.

Also reformatted a bit to make the options more readable and minimize
future conflicts.
This commit is contained in:
Christian Decker
2021-01-21 11:33:37 +01:00
parent f1962c1f4b
commit f76a6b99e0
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
external/Makefile vendored
View File

@@ -71,7 +71,19 @@ $(TARGET_DIR)/libsecp256k1.% $(TARGET_DIR)/libwallycore.%: $(TARGET_DIR)/libwall
$(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
mkdir -p ${TARGET_DIR}/libwally-core-build
cd ${TARGET_DIR}/libwally-core-build && CFLAGS=-std=c99 ${TOP}/libwally-core/configure CC="$(CC)" --enable-static=yes $(CROSSCOMPILE_OPTS) --enable-module-recovery --enable-module-extrakeys --enable-module-schnorrsig --enable-elements --enable-shared=no --prefix=/ --libdir=/ --enable-debug && $(MAKE)
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-module-extrakeys \
--enable-module-schnorrsig \
--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 :(