From e64351de375a902a7265bd6ab547c2dc31c6bb81 Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Tue, 18 Jan 2022 20:10:38 +0000
Subject: [PATCH] Disable dh_update_autotools_config

---
 debian/rules             | 3 +++
 docker/packager/packager | 9 +++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index e0ad0388de7..414d472c13d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,6 +96,9 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	cd $(BUILDDIR) && ctest -j$(THREADS_COUNT) -V
 endif
 
+# Disable config.guess and config.sub update
+override_dh_update_autotools_config:
+
 override_dh_clean:
 	rm -rf debian/copyright debian/clickhouse-client.docs debian/clickhouse-common-static.docs
 	dh_clean # -X contrib
diff --git a/docker/packager/packager b/docker/packager/packager
index c042db2251d..4e3e26d215f 100755
--- a/docker/packager/packager
+++ b/docker/packager/packager
@@ -30,10 +30,10 @@ def pull_image(image_name):
 
 def build_image(image_name, filepath):
     context = os.path.dirname(filepath)
+    build_cmd = "docker build --network=host -t {} -f {} {}".format(image_name, filepath, context)
+    logging.info("Will build image with cmd: '{}'".format(build_cmd))
     subprocess.check_call(
-        "docker build --network=host -t {} -f {} {}".format(
-            image_name, filepath, context
-        ),
+        build_cmd,
         shell=True,
     )
 
@@ -61,7 +61,6 @@ def run_docker_image_with_env(image_name, output, env_variables, ch_root, ccache
     subprocess.check_call(cmd, shell=True)
 
 def parse_env_variables(build_type, compiler, sanitizer, package_type, image_type, cache, distcc_hosts, split_binary, clang_tidy, version, author, official, alien_pkgs, with_coverage, with_binaries):
-    CLANG_PREFIX = "clang"
     DARWIN_SUFFIX = "-darwin"
     DARWIN_ARM_SUFFIX = "-darwin-aarch64"
     ARM_SUFFIX = "-aarch64"
@@ -71,13 +70,11 @@ def parse_env_variables(build_type, compiler, sanitizer, package_type, image_typ
     result = []
     cmake_flags = ['$CMAKE_FLAGS']
 
-    is_clang = compiler.startswith(CLANG_PREFIX)
     is_cross_darwin = compiler.endswith(DARWIN_SUFFIX)
     is_cross_darwin_arm = compiler.endswith(DARWIN_ARM_SUFFIX)
     is_cross_arm = compiler.endswith(ARM_SUFFIX)
     is_cross_ppc = compiler.endswith(PPC_SUFFIX)
     is_cross_freebsd = compiler.endswith(FREEBSD_SUFFIX)
-    is_cross_compile = is_cross_darwin or is_cross_darwin_arm or is_cross_arm or is_cross_freebsd or is_cross_ppc
 
     if is_cross_darwin:
         cc = compiler[:-len(DARWIN_SUFFIX)]