Skip to content

image build: use cmake #673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

image build: use cmake #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions resources/images/bitcoin/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ ARG BUILD_ARGS
RUN --mount=type=cache,target=/var/cache/apk \
sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories \
&& apk --no-cache add \
autoconf \
automake \
cmake \
python3 \
boost-dev \
build-base \
chrpath \
Expand Down Expand Up @@ -40,14 +40,14 @@ RUN set -ex \
&& git apply /tmp/isroutable.patch \
&& git apply /tmp/addrman.patch \
&& sed -i s:sys/fcntl.h:fcntl.h: src/compat/compat.h \
&& ./autogen.sh \
&& ./configure \
LDFLAGS=-L`ls -d /opt/db*`/lib/ \
CPPFLAGS="-g0 -I`ls -d /opt/db*`/include/ --param ggc-min-expand=1 --param ggc-min-heapsize=32768" \
--prefix=${BITCOIN_PREFIX} \
&& cmake -B build \
-DAPPEND_CPPFLAGS="-g0 -I`ls -d /opt/db*`/include/ --param ggc-min-expand=1 --param ggc-min-heapsize=32768" \
-DAPPEND_LDFLAGS=-L`ls -d /opt/db*`/lib/ \
-DCMAKE_INSTALL_PREFIX=${BITCOIN_PREFIX} \
${BUILD_ARGS} \
&& make -j$(nproc) \
&& make install \
&& cmake --build build -j$(nproc) \
&& cmake --install build \

&& strip ${BITCOIN_PREFIX}/bin/bitcoin-cli \
&& strip ${BITCOIN_PREFIX}/bin/bitcoind \
&& rm -f ${BITCOIN_PREFIX}/lib/libbitcoinconsensus.a \
Expand Down
5 changes: 1 addition & 4 deletions src/warnet/image_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@ def build_image(
arches: str,
action: str,
):
if not build_args:
build_args = '"--disable-tests --without-gui --disable-bench --disable-fuzz-binary --enable-suppress-external-warnings --disable-dependency-tracking "'
else:
build_args = f'"{build_args}"'
build_args = '"-DWITH_ZMQ=ON "' if not build_args else f'"{build_args}"'
Copy link
Contributor

@deadmanoz deadmanoz Mar 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't be able to build images <= v28.X if this change is made.

I tested building v28.1 using the new bake functional:

  • pre this change - builds fine
  • post this change - build fails
28.35 + ./configure 'LDFLAGS=-L/lib/' 'CPPFLAGS=-g0 -I/include/ --param ggc-min-expand=1 --param ggc-min-heapsize=32768' '--prefix=/opt/bitcoin' '-DWITH_ZMQ=ON'
28.48 configure: error: unrecognized option: '-DWITH_ZMQ=ON'


build_arches = []
if not arches:
Expand Down
Loading