Fix compile crash on glib compilation with glib dev install (#34018)

* Fix compile crash on glib compilation with glib dev install * Restyle --------- Co-authored-by: Andrei Litvin <[email protected]>
project-chip · Aug 8, 2024 · 1280048 · 1280048
1 parent 490808d
commit 1280048
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/integrations/docker/images/base/chip-build/Dockerfile b/integrations/docker/images/base/chip-build/Dockerfile
@@ -59,7 +59,6 @@ RUN set -x \
     libdmalloc-dev \
     libgif-dev \
     libgirepository-1.0-1 \
-    libgirepository1.0-dev \
     libglib2.0-dev \
     libical-dev \
     libjpeg-dev \
@@ -164,6 +163,16 @@ RUN case ${TARGETPLATFORM} in \
     ;; \
     esac
 
+# Sanitizer compilation fails if this is installed before
+# glib recompile.
+RUN set -x \
+    && apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -fy --fix-missing --no-install-recommends \
+    libgirepository1.0-dev \
+    && rm -rf /var/lib/apt/lists/ \
+    && : # last line
+
+
 # Some things that save space
 # Protoc goes from 108M to 4.6M
 RUN strip /usr/local/bin/protoc*
diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version
@@ -1 +1 @@
-58 : Add libgirepository1.0-dev to the base image, to make build_python.sh work (assume we want this everywhere)
+59 : Install order fix for glib with enabled thread sanitizer.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		58 : Add libgirepository1.0-dev to the base image, to make build_python.sh work (assume we want this everywhere)
		59 : Install order fix for glib with enabled thread sanitizer.