From d59c2a3f96511d1d5465cc0154c5932263aff4f6 Mon Sep 17 00:00:00 2001
From: Swaminathan Balachandran <sbalachandran@cloudera.com>
Date: Wed, 6 Mar 2024 10:38:17 -0800
Subject: [PATCH 1/2] HDDS-10477. Make Rocksdb tools native lib compatible with
 all chipsets within the arch

---
 hadoop-hdds/rocks-native/pom.xml            | 1 +
 hadoop-hdds/rocks-native/src/CMakeLists.txt | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hadoop-hdds/rocks-native/pom.xml b/hadoop-hdds/rocks-native/pom.xml
index 2146da977ff..5fc46abf208 100644
--- a/hadoop-hdds/rocks-native/pom.xml
+++ b/hadoop-hdds/rocks-native/pom.xml
@@ -235,6 +235,7 @@
                       <arg line="${project.build.directory}/rocksdb/rocksdb-${rocksdb.version}"/>
                     </exec>
                     <exec executable="make" dir="${project.build.directory}/rocksdb/rocksdb-${rocksdb.version}" failonerror="true">
+                      <arg line="PORTABLE=1"/>
                       <arg line="DEBUG_LEVEL=0"/>
                       <arg line="EXTRA_CXXFLAGS='-fPIC -D_GLIBCXX_USE_CXX11_ABI=0'"/>
                       <arg line="-j${system.numCores}"/>
diff --git a/hadoop-hdds/rocks-native/src/CMakeLists.txt b/hadoop-hdds/rocks-native/src/CMakeLists.txt
index 4639e2a8c92..08733acd7a7 100644
--- a/hadoop-hdds/rocks-native/src/CMakeLists.txt
+++ b/hadoop-hdds/rocks-native/src/CMakeLists.txt
@@ -22,8 +22,8 @@
 
 cmake_minimum_required(VERSION 2.8)
 add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O0")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -O0")
 project(ozone_native)
 set(CMAKE_BUILD_TYPE Release)
 find_package(JNI REQUIRED)

From 9f2aab51a299ea5baf13209665b8c9dffff338fc Mon Sep 17 00:00:00 2001
From: Swaminathan Balachandran <sbalachandran@cloudera.com>
Date: Tue, 19 Mar 2024 14:37:28 -0700
Subject: [PATCH 2/2] HDDS-10477. Remove -O0 gcc flag

---
 hadoop-hdds/rocks-native/src/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hadoop-hdds/rocks-native/src/CMakeLists.txt b/hadoop-hdds/rocks-native/src/CMakeLists.txt
index 08733acd7a7..4639e2a8c92 100644
--- a/hadoop-hdds/rocks-native/src/CMakeLists.txt
+++ b/hadoop-hdds/rocks-native/src/CMakeLists.txt
@@ -22,8 +22,8 @@
 
 cmake_minimum_required(VERSION 2.8)
 add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O0")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -O0")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
 project(ozone_native)
 set(CMAKE_BUILD_TYPE Release)
 find_package(JNI REQUIRED)