[incubator-doris] branch master updated: [Compile] fix s2 link /usr/local/openssl (#5810)

[yangzhg]

This is an automated email from the ASF dual-hosted git repository.

yangzhg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git


The following commit(s) were added to refs/heads/master by this push:
     new 2883ebe  [Compile] fix s2 link /usr/local/openssl (#5810)
2883ebe is described below

commit 2883ebeb0aa046380773d0a6eff05302d364ed38
Author: stdpain <34912776+stdp...@users.noreply.github.com>
AuthorDate: Mon May 17 11:52:21 2021 +0800

    [Compile] fix s2 link /usr/local/openssl (#5810)
---
 contrib/udf/CMakeLists.txt     | 2 +-
 contrib/udf/build_udf.sh       | 6 +++---
 thirdparty/build-thirdparty.sh | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/contrib/udf/CMakeLists.txt b/contrib/udf/CMakeLists.txt
index 8554516..6e382a0 100644
--- a/contrib/udf/CMakeLists.txt
+++ b/contrib/udf/CMakeLists.txt
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-cmake_minimum_required(VERSION 2.8.10)
+cmake_minimum_required(VERSION 3.19.2)
  
 # set CMAKE_C_COMPILER, this must set before project command
 if (DEFINED ENV{DORIS_GCC_HOME})
diff --git a/contrib/udf/build_udf.sh b/contrib/udf/build_udf.sh
index fd260de..1fce893 100644
--- a/contrib/udf/build_udf.sh
+++ b/contrib/udf/build_udf.sh
@@ -105,9 +105,9 @@ if [ ${BUILD_UDF} -eq 1 ] ; then
     fi
     mkdir -p ${CMAKE_BUILD_DIR}
     cd ${CMAKE_BUILD_DIR}
-    ${CMAKE_CMD} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ../
-    make -j${PARALLEL} VERBOSE=1
-    make install
+    ${CMAKE_CMD} -G "${GENERATOR}" -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ../
+    ${BUILD_SYSTEM} -j${PARALLEL} 
+    ${BUILD_SYSTEM} install
     cd ${UDF_HOME}
 fi
 
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index 3e540c4..fff97b8 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -603,6 +603,7 @@ build_s2() {
     -DWITH_GFLAGS=ON \
     -DGLOG_ROOT_DIR="$TP_INSTALL_DIR/include" \
     -DCMAKE_LIBRARY_PATH="$TP_INSTALL_DIR/lib" \
+    -DOPENSSL_ROOT_DIR=$TP_INSTALL_DIR/include \
     -DWITH_GLOG=ON ..
     ${BUILD_SYSTEM} -j $PARALLEL && ${BUILD_SYSTEM} install
 }

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org