Skip to content

Commit 9ffbebf

Browse files
andy31415andreilitvin
authored andcommitted
Fix compile crash on glib compilation with glib dev install (project-chip#34018)
* Fix compile crash on glib compilation with glib dev install * Restyle --------- Co-authored-by: Andrei Litvin <andreilitvin@google.com>
1 parent 3b985cb commit 9ffbebf

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

integrations/docker/images/base/chip-build/Dockerfile

+10-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ RUN set -x \
5959
libdmalloc-dev \
6060
libgif-dev \
6161
libgirepository-1.0-1 \
62-
libgirepository1.0-dev \
6362
libglib2.0-dev \
6463
libical-dev \
6564
libjpeg-dev \
@@ -164,6 +163,16 @@ RUN case ${TARGETPLATFORM} in \
164163
;; \
165164
esac
166165

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+
167176
# Some things that save space
168177
# Protoc goes from 108M to 4.6M
169178
RUN strip /usr/local/bin/protoc*
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
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.

0 commit comments

Comments
 (0)