Skip to content

Commit 31347ec

Browse files
committed
image build: use cmake
1 parent 6290072 commit 31347ec

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

resources/images/bitcoin/Dockerfile

+8-9
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ ARG BUILD_ARGS
77
RUN --mount=type=cache,target=/var/cache/apk \
88
sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories \
99
&& apk --no-cache add \
10-
autoconf \
11-
automake \
10+
cmake \
11+
python3 \
1212
boost-dev \
1313
build-base \
1414
chrpath \
@@ -40,14 +40,13 @@ RUN set -ex \
4040
&& git apply /tmp/isroutable.patch \
4141
&& git apply /tmp/addrman.patch \
4242
&& sed -i s:sys/fcntl.h:fcntl.h: src/compat/compat.h \
43-
&& ./autogen.sh \
44-
&& ./configure \
45-
LDFLAGS=-L`ls -d /opt/db*`/lib/ \
46-
CPPFLAGS="-g0 -I`ls -d /opt/db*`/include/ --param ggc-min-expand=1 --param ggc-min-heapsize=32768" \
47-
--prefix=${BITCOIN_PREFIX} \
43+
&& cmake -B build \
44+
-DAPPEND_CPPFLAGS="-g0 -I`ls -d /opt/db*`/include/ --param ggc-min-expand=1 --param ggc-min-heapsize=32768" \
45+
-DAPPEND_LDFLAGS=-L`ls -d /opt/db*`/lib/ \
4846
${BUILD_ARGS} \
49-
&& make -j$(nproc) \
50-
&& make install \
47+
&& cmake --build build -j$(nproc) \
48+
&& cmake --install build \
49+
5150
&& strip ${BITCOIN_PREFIX}/bin/bitcoin-cli \
5251
&& strip ${BITCOIN_PREFIX}/bin/bitcoind \
5352
&& rm -f ${BITCOIN_PREFIX}/lib/libbitcoinconsensus.a \

src/warnet/image_build.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ def build_image(
2323
arches: str,
2424
action: str,
2525
):
26-
if not build_args:
27-
build_args = '"--disable-tests --without-gui --disable-bench --disable-fuzz-binary --enable-suppress-external-warnings --disable-dependency-tracking "'
28-
else:
29-
build_args = f'"{build_args}"'
26+
build_args = '"-DWITH_ZMQ=ON "' if not build_args else f'"{build_args}"'
3027

3128
build_arches = []
3229
if not arches:

0 commit comments

Comments
 (0)