Skip to content

Commit 2265339

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 <rusty@rustcorp.com.au>
1 parent cb5141f commit 2265339

File tree

10 files changed

+9
-44
lines changed

10 files changed

+9
-44
lines changed

.github/scripts/setup.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ sudo apt-get -qq install --no-install-recommends --allow-unauthenticated -yy \
3535
libtool \
3636
libxml2-utils \
3737
locales \
38+
lowdown \
3839
net-tools \
3940
postgresql \
4041
python-pkg-resources \

.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

.github/workflows/ci.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ jobs:
196196
run: |
197197
bash -x .github/scripts/setup.sh
198198
sudo apt-get update -qq
199-
sudo apt-get install -y -qq lowdown
200199
# We're going to check BOLT quotes, so get the latest version
201200
git clone https://github.com/lightning/bolts.git ../${BOLTDIR}
202201

.github/workflows/macos.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: |
3838
export PATH="/usr/local/opt:/Users/runner/.local/bin:/opt/homebrew/bin/python3.10/bin:$PATH"
3939
40-
brew install gnu-sed autoconf automake libtool protobuf openssl
40+
brew install gnu-sed autoconf automake libtool protobuf openssl lowdown
4141
4242
# https://github.com/grpc/grpc/issues/31737#issuecomment-1323796842
4343
export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1

.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
@@ -518,10 +518,9 @@ else
518518
HAVE_PYTHON3_MAKO=0
519519
fi
520520

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

527526
if echo | check_command sha256sum sha256sum; then
@@ -615,7 +614,6 @@ add_var ASAN "$ASAN"
615614
add_var UBSAN "$UBSAN"
616615
add_var TEST_NETWORK "$TEST_NETWORK"
617616
add_var HAVE_PYTHON3_MAKO "$HAVE_PYTHON3_MAKO"
618-
add_var HAVE_LOWDOWN "$HAVE_LOWDOWN"
619617
add_var SHA256SUM "$SHA256SUM"
620618
add_var FUZZING "$FUZZING"
621619
add_var RUST "$RUST"

doc/Makefile

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

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

216207
# For versions in documentation, we don't change with every git version, to
217208
# 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: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Get dependencies:
8383
sudo apt-get update
8484
sudo apt-get install -y \
8585
jq autoconf automake build-essential git libtool libsqlite3-dev libffi-dev \
86-
python3 python3-pip net-tools zlib1g-dev libsodium-dev gettext
86+
python3 python3-pip net-tools zlib1g-dev libsodium-dev gettext lowdown
8787
pip3 install --upgrade pip
8888
curl -LsSf https://astral.sh/uv/install.sh | sh
8989
```
@@ -121,8 +121,6 @@ sudo apt-get install -y valgrind libpq-dev shellcheck cppcheck \
121121
libsecp256k1-dev lowdown
122122
```
123123

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

128126
```shell
@@ -239,7 +237,7 @@ lightningd --network=testnet
239237
OS version: FreeBSD 11.1-RELEASE or above
240238

241239
```shell
242-
pkg install git python py39-pip gmake libtool gmp sqlite3 postgresql13-client gettext autotools
240+
pkg install git python py39-pip gmake libtool gmp sqlite3 postgresql13-client gettext autotools lowdown
243241
https://github.com/ElementsProject/lightning.git
244242
pip install --upgrade pip
245243
pip3 install mako
@@ -331,7 +329,7 @@ make
331329
Assuming you have Xcode and Homebrew installed. Install dependencies:
332330

333331
```shell
334-
brew install autoconf automake libtool python3 gnu-sed gettext libsodium protobuf
332+
brew install autoconf automake libtool python3 gnu-sed gettext libsodium protobuf lowdown
335333
export PATH="/usr/local/opt:$PATH"
336334
```
337335

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
@@ -141,11 +141,6 @@ echo "Current Timestamp: $DATE"
141141
mkdir -p "$RELEASEDIR"
142142

143143
if [ "$WITHOUT_ZIP" = "false" ]; then
144-
# submodcheck needs to know if we have lowdown
145-
touch config.vars
146-
./configure --reconfigure
147-
# If you don't have lowdown, your zip file will include it: we assume everyone has it now!
148-
grep -q "HAVE_LOWDOWN=1" config.vars || (echo "Please install lowdown" >&2; exit 1)
149144
# If it's a completely clean directory, we need submodules!
150145
make submodcheck
151146

0 commit comments

Comments
 (0)