Skip to content

Commit 3ad5a6c

Browse files
author
Claudio Raimondi
committed
Fix PKG_CONFIG [skip ci]
1 parent f91ac2d commit 3ad5a6c

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

Dockerfile

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,13 @@ RUN apt-get update && \
7373
python3-dev \
7474
autoconf \
7575
automake \
76-
libicu-dev \
7776
pkg-config \
7877
bison \
7978
flex \
8079
jq \
8180
libtool \
8281
gettext \
83-
protobuf-compiler \
84-
qemu-user-static \
85-
binfmt-support
82+
protobuf-compiler
8683

8784
WORKDIR /opt
8885

@@ -126,6 +123,7 @@ RUN dpkg --add-architecture ${target_arch_dpkg}
126123

127124
RUN apt-get update && \
128125
apt-get install -qq -y --no-install-recommends \
126+
libicu-dev:${target_arch_dpkg} \
129127
zlib1g-dev:${target_arch_dpkg} \
130128
libsqlite3-dev:${target_arch_dpkg} \
131129
libpq-dev:${target_arch_dpkg} \
@@ -140,8 +138,16 @@ ARG CXX=${target_arch}-g++
140138
ARG LD=${target_arch}-ld
141139
ARG STRIP=${target_arch}-strip
142140
ARG TARGET=${target_arch_rust}
141+
ARG PKG_CONFIG_PATH=/usr/lib/${target_arch}/pkgconfig
143142
ARG COPTFLAGS="-O2 ${COPTFLAGS}"
144143

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+
145151
WORKDIR /opt
146152

147153
RUN ./install-uv.sh -q
@@ -151,13 +157,6 @@ ENV PATH="/root/.cargo/bin:/root/.local/bin:${PATH}"
151157

152158
WORKDIR /opt/lightningd
153159

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-
161160
#TODO: Fix unaligned access on armv7
162161
RUN ./configure --prefix=/tmp/lightning_install --enable-static --disable-compat --disable-valgrind
163162
COPY .git/ .git/

0 commit comments

Comments
 (0)