Skip to content

Commit 4d21c43

Browse files
committed
external/lowdown: remove.
Every distribution we have packages this now. Changelog-Changed: Build: lowdown is now required (we no longer bundle our own). Signed-off-by: Rusty Russell <[email protected]>
1 parent 45397b4 commit 4d21c43

File tree

7 files changed

+4
-39
lines changed

7 files changed

+4
-39
lines changed

.github/workflows/bsd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
git clone https://github.com/lightning/bolts.git ../bolts
6161
# fatal: unsafe repository ('/Users/runner/work/lightning/lightning' is owned by someone else)
6262
git config --global --add safe.directory `pwd`
63-
for d in libsodium libwally-core gheap jsmn libbacktrace lowdown; do git config --global --add safe.directory `pwd`/external/$d; done
63+
for d in libsodium libwally-core gheap jsmn libbacktrace; do git config --global --add safe.directory `pwd`/external/$d; done
6464
git submodule update --init --recursive
6565
6666
./configure CC="$CC" --disable-valgrind

.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,3 @@
1414
[submodule "external/gheap"]
1515
path = external/gheap
1616
url = https://github.com/valyala/gheap
17-
[submodule "external/lowdown"]
18-
path = external/lowdown
19-
url = https://github.com/kristapsdz/lowdown.git
20-
ignore = dirty

configure

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -519,10 +519,9 @@ else
519519
HAVE_PYTHON3_MAKO=0
520520
fi
521521

522-
if check_command 'lowdown' lowdown; then
523-
HAVE_LOWDOWN=1
524-
else
525-
HAVE_LOWDOWN=0
522+
if ! check_command 'lowdown' lowdown; then
523+
echo "*** We need lowdown!" >&2
524+
exit 1
526525
fi
527526

528527
if echo | check_command sha256sum sha256sum; then
@@ -572,7 +571,6 @@ add_var ASAN "$ASAN"
572571
add_var UBSAN "$UBSAN"
573572
add_var TEST_NETWORK "$TEST_NETWORK"
574573
add_var HAVE_PYTHON3_MAKO "$HAVE_PYTHON3_MAKO"
575-
add_var HAVE_LOWDOWN "$HAVE_LOWDOWN"
576574
add_var SHA256SUM "$SHA256SUM"
577575
add_var FUZZING "$FUZZING"
578576
add_var RUST "$RUST"

doc/Makefile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -201,16 +201,7 @@ RBRACKET=)
201201
$(MARKDOWNPAGES_WITH_EXT): doc/%.7.md: doc/schemas/%.json tools/fromschema.py
202202
@tools/fromschema.py --markdownfile=$@ $< > $@.tmp && mv $@.tmp $@
203203

204-
# If we need to build lowdown, make tools/md2man.sh depend on it.
205-
# That way it's not used in SHA256STAMP (which only uses direct
206-
# dependencies), but make will be forced to build it.
207-
ifeq ($(HAVE_LOWDOWN),0)
208-
LOWDOWN := $(TARGET_DIR)/lowdown-build/bin/lowdown
209-
tools/md2man.sh: $(LOWDOWN)
210-
touch $@
211-
else
212204
LOWDOWN := lowdown
213-
endif
214205

215206
# For versions in documentation, we don't change with every git version, to
216207
# save build time. We build them on new tags or keep them on pre-next-release version.

doc/getting-started/getting-started/installation.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ sudo apt-get install -y valgrind libpq-dev shellcheck cppcheck \
115115
libsecp256k1-dev lowdown
116116
```
117117

118-
If you can't install `lowdown`, a version will be built in-tree.
119-
120118
If you want to build the Rust plugins (cln-grpc, clnrest, cln-bip353 and wss-proxy):
121119

122120
```shell

external/Makefile

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ SUBMODULES = \
55
external/jsmn \
66
external/libbacktrace
77

8-
ifeq ($(HAVE_LOWDOWN),0)
9-
SUBMODULES += external/lowdown
10-
endif
11-
128
TOP := ../..
139
ifdef BUILD
1410
CROSSCOMPILE_OPTS := --host="$(MAKE_HOST)" --build="$(BUILD)"
@@ -32,10 +28,6 @@ LIBBACKTRACE_HEADERS := external/libbacktrace/backtrace.h
3228
EXTERNAL_HEADERS := $(LIBSODIUM_HEADERS) $(LIBWALLY_HEADERS) $(LIBSECP_HEADERS) $(JSMN_HEADERS) $(GHEAP_HEADERS) $(LIBBACKTRACE_HEADERS)
3329
EXTERNAL_LIBS := ${TARGET_DIR}/libwallycore.a ${TARGET_DIR}/libsecp256k1.a ${TARGET_DIR}/libjsmn.a ${TARGET_DIR}/libbacktrace.a
3430

35-
ifeq ($(HAVE_LOWDOWN),0)
36-
EXTERNAL_HEADERS += external/lowdown/lowdown.h
37-
endif
38-
3931
EXTERNAL_INCLUDE_FLAGS := \
4032
-I external/libwally-core/include/ \
4133
-I external/libwally-core/src/secp256k1/include/ \
@@ -117,10 +109,6 @@ $(TARGET_DIR)/libbacktrace.a: external/libbacktrace/backtrace.h
117109
cd $(TARGET_DIR)/libbacktrace-build && $(TOP)/libbacktrace/configure CC="$(CC)" --enable-static=yes $(CROSSCOMPILE_OPTS) --enable-shared=no --prefix=/ --libdir=/ && $(MAKE)
118110
$(MAKE) -C $(TARGET_DIR)/libbacktrace-build DESTDIR=$$(pwd)/$(TARGET_DIR) install-exec
119111

120-
$(TARGET_DIR)/lowdown-build/bin/lowdown: external/lowdown/lowdown.h
121-
cd external/lowdown && CC="$(CC)" CFLAGS="$(FUZZFLAGS)" ./configure LDFLAGS="$(FUZZFLAGS)" PREFIX=`pwd`/$(TOP)/$(TARGET_DIR)/lowdown-build/
122-
$(MAKE) -C external/lowdown install
123-
124112
distclean: external-distclean
125113
clean: external-clean
126114

@@ -130,6 +118,5 @@ external-clean:
130118

131119
external-distclean:
132120
make -C external/libsodium distclean || true
133-
if [ -f external/lowdown/Makefile.configure ]; then $(MAKE) -C external/lowdown distclean; fi
134121
$(RM) -rf ${TARGET_DIR}/libbacktrace-build ${TARGET_DIR}/libsodium-build ${TARGET_DIR}/libwally-core-build ${TARGET_DIR}/jsmn-build
135122
$(RM) -r `git status --ignored --porcelain external/libwally-core | grep '^!! ' | cut -c3-`

tools/build-release.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,6 @@ echo "Current Timestamp: $DATE"
124124
mkdir -p "$RELEASEDIR"
125125

126126
if [ "$WITHOUT_ZIP" = "false" ]; then
127-
# submodcheck needs to know if we have lowdown
128-
touch config.vars
129-
./configure --reconfigure
130-
# If you don't have lowdown, your zip file will include it: we assume everyone has it now!
131-
grep -q "HAVE_LOWDOWN=1" config.vars || (echo "Please install lowdown" >&2; exit 1)
132127
# If it's a completely clean directory, we need submodules!
133128
make submodcheck
134129

0 commit comments

Comments
 (0)