From 4dae461183c6ec9c54c59ee7e8a6f558fd2da09d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 23 Mar 2021 01:36:06 +0100
Subject: [PATCH] Move ASAN-specific packages installation

No changes yet, just reorganize things to make upcoming changes simpler.
---
 build/tools/before_install.sh | 46 +++++++++++++++++------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/build/tools/before_install.sh b/build/tools/before_install.sh
index 8ce44ea704..a60cc80695 100755
--- a/build/tools/before_install.sh
+++ b/build/tools/before_install.sh
@@ -9,6 +9,29 @@ SUDO=sudo
 case $(uname -s) in
     Linux)
         if [ -f /etc/apt/sources.list ]; then
+            if [ "$wxUSE_ASAN" = 1 ]; then
+                codename=$(lsb_release --codename --short)
+                # Enable the `-dbgsym` repositories.
+                echo "deb http://ddebs.ubuntu.com ${codename} main restricted universe multiverse
+                deb http://ddebs.ubuntu.com ${codename}-updates main restricted universe multiverse
+                deb http://ddebs.ubuntu.com ${codename}-proposed main restricted universe multiverse" | \
+                $SUDO tee --append /etc/apt/sources.list.d/ddebs.list
+
+                # Import the debug symbol archive signing key from the Ubuntu server.
+                # Note that this command works only on Ubuntu 18.04 LTS and newer.
+                $SUDO apt-get install -y ubuntu-dbgsym-keyring
+
+                # The key in the package above is currently (2021-03-22) out of
+                # date, so get the latest key manually (this is completely
+                # insecure, of course, but we don't care).
+                wget -O - http://ddebs.ubuntu.com/dbgsym-release-key.asc | $SUDO apt-key add -
+
+                $SUDO apt-get update
+
+                # Install the symbols to allow LSAN suppression list to work.
+                $SUDO apt-get install -y libfontconfig1-dbgsym libglib2.0-0-dbgsym libgtk-3-0-dbgsym libatk-bridge2.0-0-dbgsym
+            fi
+
             $SUDO apt-get update
 
             case "$wxCONFIGURE_FLAGS" in
@@ -45,29 +68,6 @@ case $(uname -s) in
             done
 
             $SUDO apt-get install -y $libtoolkit_dev $pkg_install
-
-            if [ "$wxUSE_ASAN" = 1 ]; then
-                codename=$(lsb_release --codename --short)
-                # Enable the `-dbgsym` repositories.
-                echo "deb http://ddebs.ubuntu.com ${codename} main restricted universe multiverse
-                deb http://ddebs.ubuntu.com ${codename}-updates main restricted universe multiverse
-                deb http://ddebs.ubuntu.com ${codename}-proposed main restricted universe multiverse" | \
-                $SUDO tee --append /etc/apt/sources.list.d/ddebs.list
-
-                # Import the debug symbol archive signing key from the Ubuntu server.
-                # Note that this command works only on Ubuntu 18.04 LTS and newer.
-                $SUDO apt-get install -y ubuntu-dbgsym-keyring
-
-                # The key in the package above is currently (2021-03-22) out of
-                # date, so get the latest key manually (this is completely
-                # insecure, of course, but we don't care).
-                wget -O - http://ddebs.ubuntu.com/dbgsym-release-key.asc | $SUDO apt-key add -
-
-                $SUDO apt-get update
-
-                # Install the symbols to allow LSAN suppression list to work.
-                $SUDO apt-get install -y libfontconfig1-dbgsym libglib2.0-0-dbgsym libgtk-3-0-dbgsym libatk-bridge2.0-0-dbgsym
-            fi
         fi
         ;;