File tree 2 files changed +11
-2
lines changed
integrations/docker/images/base/chip-build
2 files changed +11
-2
lines changed Original file line number Diff line number Diff line change @@ -59,7 +59,6 @@ RUN set -x \
59
59
libdmalloc-dev \
60
60
libgif-dev \
61
61
libgirepository-1.0-1 \
62
- libgirepository1.0-dev \
63
62
libglib2.0-dev \
64
63
libical-dev \
65
64
libjpeg-dev \
@@ -164,6 +163,16 @@ RUN case ${TARGETPLATFORM} in \
164
163
;; \
165
164
esac
166
165
166
+ # Sanitizer compilation fails if this is installed before
167
+ # glib recompile.
168
+ RUN set -x \
169
+ && apt-get update \
170
+ && DEBIAN_FRONTEND=noninteractive apt-get install -fy --fix-missing --no-install-recommends \
171
+ libgirepository1.0-dev \
172
+ && rm -rf /var/lib/apt/lists/ \
173
+ && : # last line
174
+
175
+
167
176
# Some things that save space
168
177
# Protoc goes from 108M to 4.6M
169
178
RUN strip /usr/local/bin/protoc*
Original file line number Diff line number Diff line change 1
- 58 : Add libgirepository1.0-dev to the base image, to make build_python.sh work (assume we want this everywhere)
1
+ 59 : Install order fix for glib with enabled thread sanitizer.
You can’t perform that action at this time.
0 commit comments