From f23633e83de509ae25b10eb168a7ca16a3dbfce8 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Tue, 3 Dec 2024 22:28:18 +0800
Subject: [PATCH] feat:[TD-32642] add timezone support in windows

---
 contrib/CMakeLists.txt         |  2 +-
 source/os/CMakeLists.txt       |  2 +-
 source/os/test/osTimeTests.cpp | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index c5ed4cf52d..af05b2c47c 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -665,7 +665,7 @@ MESSAGE(STATUS "timezone file path: " ${TZ_OUTPUT_PATH})
 
 if(NOT ${TD_WINDOWS})
     execute_process(
-            COMMAND make TZDIR=${TZ_OUTPUT_PATH}/ clean libtz.a
+            COMMAND make CFLAGS+=-fPIC TZDIR=${TZ_OUTPUT_PATH}/ clean libtz.a
             WORKING_DIRECTORY "${TD_CONTRIB_DIR}/tz"
     )
 
diff --git a/source/os/CMakeLists.txt b/source/os/CMakeLists.txt
index 220fef072b..a0f9e5b87a 100644
--- a/source/os/CMakeLists.txt
+++ b/source/os/CMakeLists.txt
@@ -72,7 +72,7 @@ ENDIF ()
 
 if(NOT ${TD_WINDOWS})
     find_library(tz libtz.a "${TD_SOURCE_DIR}/contrib/tz")
-    target_link_libraries(os  PUBLIC ${tz})
+    target_link_libraries(os PUBLIC ${tz})
 endif(NOT ${TD_WINDOWS})
 
 if(${BUILD_TEST})
diff --git a/source/os/test/osTimeTests.cpp b/source/os/test/osTimeTests.cpp
index 501502f7e6..5c8c837dca 100644
--- a/source/os/test/osTimeTests.cpp
+++ b/source/os/test/osTimeTests.cpp
@@ -49,7 +49,7 @@ TEST(osTimeTests, taosLocalTime) {
   // Test 4: Test when timep is negative on Windows
 #ifdef WINDOWS
   time_t pos_timep = 1609459200;  // 2021-01-01 08:00:00
-  local_time = taosLocalTime(&pos_timep, &result, NULL, 0);
+  local_time = taosLocalTime(&pos_timep, &result, NULL, 0, NULL);
   ASSERT_NE(local_time, nullptr);
   ASSERT_EQ(local_time->tm_year, 121);
   ASSERT_EQ(local_time->tm_mon, 0);
@@ -59,7 +59,7 @@ TEST(osTimeTests, taosLocalTime) {
   ASSERT_EQ(local_time->tm_sec, 0);
 
   time_t neg_timep = -1617531000;  // 1918-09-29 21:50:00
-  local_time = taosLocalTime(&neg_timep, &result, NULL, 0);
+  local_time = taosLocalTime(&neg_timep, &result, NULL, 0, NULL);
   ASSERT_NE(local_time, nullptr);
   ASSERT_EQ(local_time->tm_year, 18);
   ASSERT_EQ(local_time->tm_mon, 8);
@@ -69,7 +69,7 @@ TEST(osTimeTests, taosLocalTime) {
   ASSERT_EQ(local_time->tm_sec, 0);
 
   time_t neg_timep2 = -315619200;  // 1960-01-01 08:00:00
-  local_time = taosLocalTime(&neg_timep2, &result, NULL, 0);
+  local_time = taosLocalTime(&neg_timep2, &result, NULL, 0, NULL);
   ASSERT_NE(local_time, nullptr);
   ASSERT_EQ(local_time->tm_year, 60);
   ASSERT_EQ(local_time->tm_mon, 0);
@@ -79,7 +79,7 @@ TEST(osTimeTests, taosLocalTime) {
   ASSERT_EQ(local_time->tm_sec, 0);
 
   time_t zero_timep = 0;  // 1970-01-01 08:00:00
-  local_time = taosLocalTime(&zero_timep, &result, NULL, 0);
+  local_time = taosLocalTime(&zero_timep, &result, NULL, 0, NULL);
   ASSERT_NE(local_time, nullptr);
   ASSERT_EQ(local_time->tm_year, 70);
   ASSERT_EQ(local_time->tm_mon, 0);
@@ -89,7 +89,7 @@ TEST(osTimeTests, taosLocalTime) {
   ASSERT_EQ(local_time->tm_sec, 0);
 
   time_t neg_timep3 = -78115158887;
-  local_time = taosLocalTime(&neg_timep3, &result, NULL, 0);
+  local_time = taosLocalTime(&neg_timep3, &result, NULL, 0, NULL);
   ASSERT_EQ(local_time, nullptr);
 #endif
 }
\ No newline at end of file