From 06781efcb785a0504d9599e6a1446e235caef13d Mon Sep 17 00:00:00 2001
From: Michael Kolupaev <michael.kolupaev@clickhouse.com>
Date: Thu, 20 Jun 2024 22:59:36 +0000
Subject: [PATCH] Switch to a cleaner update, hopefully fix builds

---
 contrib/zlib-ng                      |  2 +-
 contrib/zlib-ng-cmake/CMakeLists.txt | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/contrib/zlib-ng b/contrib/zlib-ng
index bfb184bb0fb..c19ba056b7c 160000
--- a/contrib/zlib-ng
+++ b/contrib/zlib-ng
@@ -1 +1 @@
-Subproject commit bfb184bb0fbdabe82f3a36d209e56c3e2c33866a
+Subproject commit c19ba056b7cc8029bb80f509956090c7ded58032
diff --git a/contrib/zlib-ng-cmake/CMakeLists.txt b/contrib/zlib-ng-cmake/CMakeLists.txt
index 1ed1d98ed66..91a8eb2e0a3 100644
--- a/contrib/zlib-ng-cmake/CMakeLists.txt
+++ b/contrib/zlib-ng-cmake/CMakeLists.txt
@@ -15,6 +15,7 @@ add_definitions(-DHAVE_VISIBILITY_INTERNAL)
 add_definitions(-DHAVE_BUILTIN_CTZ)
 add_definitions(-DHAVE_BUILTIN_CTZLL)
 add_definitions(-DHAVE_ATTRIBUTE_ALIGNED)
+add_definitions(-DHAVE_POSIX_MEMALIGN)
 
 set(ZLIB_ARCH_SRCS)
 set(ZLIB_ARCH_HDRS)
@@ -44,10 +45,16 @@ if(ARCH_AARCH64)
 elseif(ARCH_PPC64LE)
     set(ARCHDIR "${SOURCE_DIR}/arch/power")
 
-    add_definitions(-DPOWER8)
     add_definitions(-DPOWER_FEATURES)
-    add_definitions(-DPOWER8_VSX)
-    add_definitions(-DPOWER8_VSX_CRC32)
+    add_definitions(-DHAVE_SYS_AUXV_H)
+
+    if(POWER9)
+        add_definitions(-DPOWER9)
+    else()
+        add_definitions(-DPOWER8)
+        add_definitions(-DPOWER8_VSX)
+        add_definitions(-DPOWER8_VSX_CRC32)
+    endif()
 
     list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/power_features.h)
     list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/power_features.c)