From 394179f44f658e2ba9e004c9c7858378456a8499 Mon Sep 17 00:00:00 2001
From: ltrk2 <107155950+ltrk2@users.noreply.github.com>
Date: Thu, 24 Aug 2023 13:55:13 -0700
Subject: [PATCH] Enable producing endianness-independent output in lz4

---
 .gitmodules                      | 2 +-
 contrib/lz4                      | 2 +-
 contrib/lz4-cmake/CMakeLists.txt | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index c3592372b7e..70e034b0742 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/facebook/zstd
 [submodule "contrib/lz4"]
 	path = contrib/lz4
-	url = https://github.com/lz4/lz4
+	url = https://github.com/ClickHouse/lz4
 [submodule "contrib/librdkafka"]
 	path = contrib/librdkafka
 	url = https://github.com/ClickHouse/librdkafka
diff --git a/contrib/lz4 b/contrib/lz4
index e82198428c8..92ebf1870b9 160000
--- a/contrib/lz4
+++ b/contrib/lz4
@@ -1 +1 @@
-Subproject commit e82198428c8061372d5adef1f9bfff4203f6081e
+Subproject commit 92ebf1870b9acbefc0e7970409a181954a10ff40
diff --git a/contrib/lz4-cmake/CMakeLists.txt b/contrib/lz4-cmake/CMakeLists.txt
index c0fd574134f..0f37022d515 100644
--- a/contrib/lz4-cmake/CMakeLists.txt
+++ b/contrib/lz4-cmake/CMakeLists.txt
@@ -13,6 +13,11 @@ add_library (ch_contrib::lz4 ALIAS _lz4)
 
 target_compile_definitions (_lz4 PUBLIC LZ4_DISABLE_DEPRECATE_WARNINGS=1)
 target_compile_definitions (_lz4 PUBLIC LZ4_FAST_DEC_LOOP=1)
+
+if(ARCH_S390X)
+    target_compile_definitions(_lz4 PRIVATE LZ4_STATIC_LINKING_ONLY_ENDIANNESS_INDEPENDENT_OUTPUT)
+endif()
+
 if (SANITIZE STREQUAL "undefined")
     target_compile_options (_lz4 PRIVATE -fno-sanitize=undefined)
 endif ()