From f361b41548ca71f0d124422c3ce2d95ad11c3eeb Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andreilitvin@google.com>
Date: Wed, 19 Jun 2024 13:38:48 -0400
Subject: [PATCH 1/2] Fix compile crash on glib compilation with glib dev
install
---
integrations/docker/images/base/chip-build/Dockerfile | 11 ++++++++++-
integrations/docker/images/base/chip-build/version | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/integrations/docker/images/base/chip-build/Dockerfile b/integrations/docker/images/base/chip-build/Dockerfile
index ebe222b8a7e468..a2785cd95a2076 100644
--- 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
index 94561c77a986e4..375ee709695659 100644
--- 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.
From 1758a6043fc2dc69746e8a6e5049337a31d13e02 Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andreilitvin@google.com>
Date: Wed, 19 Jun 2024 13:40:50 -0400
Subject: [PATCH 2/2] Restyle
---
integrations/docker/images/base/chip-build/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/integrations/docker/images/base/chip-build/Dockerfile b/integrations/docker/images/base/chip-build/Dockerfile
index a2785cd95a2076..db209a82f20b87 100644
--- a/integrations/docker/images/base/chip-build/Dockerfile
+++ b/integrations/docker/images/base/chip-build/Dockerfile
@@ -163,7 +163,7 @@ RUN case ${TARGETPLATFORM} in \
;; \
esac
-# Sanitizer compilation fails if this is installed before
+# Sanitizer compilation fails if this is installed before
# glib recompile.
RUN set -x \
&& apt-get update \