@@ -73,16 +73,13 @@ RUN apt-get update && \
73
73
python3-dev \
74
74
autoconf \
75
75
automake \
76
- libicu-dev \
77
76
pkg-config \
78
77
bison \
79
78
flex \
80
79
jq \
81
80
libtool \
82
81
gettext \
83
- protobuf-compiler \
84
- qemu-user-static \
85
- binfmt-support
82
+ protobuf-compiler
86
83
87
84
WORKDIR /opt
88
85
@@ -126,6 +123,7 @@ RUN dpkg --add-architecture ${target_arch_dpkg}
126
123
127
124
RUN apt-get update && \
128
125
apt-get install -qq -y --no-install-recommends \
126
+ libicu-dev:${target_arch_dpkg} \
129
127
zlib1g-dev:${target_arch_dpkg} \
130
128
libsqlite3-dev:${target_arch_dpkg} \
131
129
libpq-dev:${target_arch_dpkg} \
@@ -140,8 +138,16 @@ ARG CXX=${target_arch}-g++
140
138
ARG LD=${target_arch}-ld
141
139
ARG STRIP=${target_arch}-strip
142
140
ARG TARGET=${target_arch_rust}
141
+ ARG PKG_CONFIG_PATH=/usr/lib/${target_arch}/pkgconfig
143
142
ARG COPTFLAGS="-O2 ${COPTFLAGS}"
144
143
144
+ # TODO: find a way to set these in ENV isntead of writing into config.toml
145
+ RUN mkdir -p .cargo && tee .cargo/config.toml <<EOF
146
+ [target.${target_arch_rust}]
147
+ linker = "${target_arch}-gcc"
148
+ rustflags = ["-C" , "target-cpu=generic" ]
149
+ EOF
150
+
145
151
WORKDIR /opt
146
152
147
153
RUN ./install-uv.sh -q
@@ -151,13 +157,6 @@ ENV PATH="/root/.cargo/bin:/root/.local/bin:${PATH}"
151
157
152
158
WORKDIR /opt/lightningd
153
159
154
- # TODO: set these in env instead of file?
155
- RUN mkdir -p .cargo && tee .cargo/config.toml <<EOF
156
- [target.${target_arch_rust}]
157
- linker = "${target_arch}-gcc"
158
- rustflags = ["-C" , "target-cpu=generic" ]
159
- EOF
160
-
161
160
# TODO: Fix unaligned access on armv7
162
161
RUN ./configure --prefix=/tmp/lightning_install --enable-static --disable-compat --disable-valgrind
163
162
COPY .git/ .git/
0 commit comments