From 6987ac40e15bb970226a6520d5bb760a38886127 Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <roman.nozdrin@mariadb.com>
Date: Wed, 6 May 2020 11:47:08 +0000
Subject: [PATCH] MCOL-3982 Avoid using autotools for libmarias3 and remove
 libxml2 from libmarias3 dependencies.

---
 CMakeLists.txt                  |  5 -----
 storage-manager/CMakeLists.txt  |  2 +-
 utils/libmarias3/CMakeLists.txt | 30 ++++++++++++++++--------------
 utils/libmarias3/libmarias3     |  2 +-
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f478eed72..5d1f7ef29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -311,11 +311,6 @@ SET (ENGINE_COMMON_INCLUDES  ${ENGINE_DEFAULT_INCLUDES} ${Boost_INCLUDE_DIR} ${L
 
 ADD_SUBDIRECTORY(utils)
 
-add_library(marias3 SHARED IMPORTED)
-set_target_properties(marias3 PROPERTIES IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/lib/libmarias3.so.3.1.2)
-add_dependencies(marias3 ms3)
-
-
 ADD_SUBDIRECTORY(oam/oamcpp)
 ADD_SUBDIRECTORY(dbcon/execplan)
 ADD_SUBDIRECTORY(dbcon/joblist)
diff --git a/storage-manager/CMakeLists.txt b/storage-manager/CMakeLists.txt
index b6644f1e2..4f7e01816 100755
--- a/storage-manager/CMakeLists.txt
+++ b/storage-manager/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(storagemanager)
 
-include_directories(include ${CMAKE_BINARY_DIR}/include ${ENGINE_UTILS_COMMON_INCLUDE})
+include_directories(include ${CMAKE_BINARY_DIR}/include ${ENGINE_UTILS_COMMON_INCLUDE} ${S3API_DIR})
 
 set(storagemanager_SRCS 
     src/AppendTask.cpp
diff --git a/utils/libmarias3/CMakeLists.txt b/utils/libmarias3/CMakeLists.txt
index a74b547a6..464c8c471 100644
--- a/utils/libmarias3/CMakeLists.txt
+++ b/utils/libmarias3/CMakeLists.txt
@@ -16,22 +16,24 @@ if(GIT_FOUND AND EXISTS ${ENGINE_SRC_DIR}/.git)
     endif()
 endif()
 
-include(ExternalProject)
-ExternalProject_Add(ms3
-    SOURCE_DIR ${S3API_DIR}
-    CONFIGURE_COMMAND autoreconf -fi ${S3API_DIR} && ${S3API_DIR}/configure --enable-shared --disable-static --prefix=${CMAKE_BINARY_DIR} ${S3_CONFIGURE_OPT}
-    BUILD_COMMAND make
-    BUILD_IN_SOURCE 0
-    EXCLUDE_FROM_ALL TRUE
-    BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/lib/libmarias3.so.3.1.2
-)
+SET(S3_SOURCES ${S3API_DIR}/src/debug.c
+    ${S3API_DIR}/src/error.c
+    ${S3API_DIR}/src/marias3.c
+    ${S3API_DIR}/src/request.c
+    ${S3API_DIR}/src/response.c
+    ${S3API_DIR}/src/sha256.c
+    ${S3API_DIR}/src/sha256-internal.c
+    ${S3API_DIR}/src/xml.c)
 
-set(S3API_DEPS marias3 curl xml2 CACHE INTERNAL "S3API_DEPS")
+ADD_LIBRARY(marias3 SHARED ${S3_SOURCES})
 
-install(PROGRAMS
-    ${CMAKE_BINARY_DIR}/lib/libmarias3.so.3.1.2
-    ${CMAKE_BINARY_DIR}/lib/libmarias3.so.3
-    ${CMAKE_BINARY_DIR}/lib/libmarias3.so
+FIND_PACKAGE(CURL REQUIRED)
+TARGET_LINK_LIBRARIES(marias3 curl)
+INCLUDE_DIRECTORIES(${S3API_DIR})
+
+set(S3API_DEPS marias3 curl CACHE INTERNAL "S3API_DEPS")
+
+install(TARGETS marias3
     DESTINATION ${ENGINE_LIBDIR}
     COMPONENT columnstore-platform
 )
diff --git a/utils/libmarias3/libmarias3 b/utils/libmarias3/libmarias3
index 4d9691c6b..8727cf74f 160000
--- a/utils/libmarias3/libmarias3
+++ b/utils/libmarias3/libmarias3
@@ -1 +1 @@
-Subproject commit 4d9691c6b851610044f21705fb5e12d0c676abca
+Subproject commit 8727cf74fd9fe641ee1b200486036f311e2bd09b