Added support for native build (#163)

Author: dutor

build.sh

@@ -11,7 +11,7 @@ start_time=$(date +%s)
 
 # Always use bash
 shell=$(basename $(readlink /proc/$$/exe))
-if [ ! x$shell = x"bash" ] && [[ x$shell != x"qemu-aarch64"* ]]
+if [ ! x$shell = x"bash" ] && [ x$shell != x"qemu-aarch64"* ]
 then
     bash $0 $@
     exit $?
@@ -186,8 +186,11 @@ cd $build_dir
 
 echo "Starting building third-party libraries"
 
+[[ -z ${isa} ]] && isa=generic
+
 $cmake_cmd  -DDOWNLOAD_DIR=$download_dir              \
             -DCMAKE_INSTALL_PREFIX=$install_dir       \
+            -DUSE_ISA=${isa}                          \
             ${C_COMPILER_ARG} ${CXX_COMPILER_ARG}     \
             ${DISABLE_CXX11_ABI}                      \
             $source_dir |& tee $logfile
@@ -259,14 +262,14 @@ done
 # Remove CMake configs of boost
 rm -rf $install_dir/lib/cmake/[Bb]oost*
 
-march=$(uname -m)
+march=${isa:-$(uname -m)}
 
 cat > $install_dir/version-info <<EOF
 Package         : Nebula Third Party
 Version         : $VERSION
 Date            : $(date)
 glibc           : $libc_version
-Arch            : $march
+Arch            : $(uname -m)($march)
 Compiler        : GCC $gcc_version
 C++ ABI         : $abi_version
 Vendor          : VEsoft Inc.
@@ -283,7 +286,12 @@ set -e
 hash xz &> /dev/null || { echo "xz: Command not found"; exit 1; }
 
 [[ \$# -ne 0 ]] && prefix=\$(echo "\$@" | sed 's;.*--prefix=(\S*).*;\1;p' -rn)
-prefix=\${prefix:-/opt/vesoft/third-party/$VERSION}
+if [[ $isa = "generic" ]]
+then
+    prefix=\${prefix:-/opt/vesoft/third-party/$VERSION}
+else
+    prefix=\${prefix:-/opt/vesoft/third-party/$isa/$VERSION}
+fi
 mkdir -p \$prefix
 
 [[ -w \$prefix ]] || { echo "\$prefix: No permission to write"; exit 1; }

project/CMakeLists.txt

@@ -133,6 +133,11 @@ else()
     set(extra_cpp_flags "-D_GLIBCXX_USE_CXX11_ABI=1")
 endif()
 
+set(ISA_FLAGS "")
+if (NOT ${USE_ISA} STREQUAL "" AND NOT ${USE_ISA} STREQUAL "generic")
+    set(ISA_FLAGS "-march=${USE_ISA} -mtune=${USE_ISA}")
+endif()
+
 if(GLIBC_VERSION VERSION_LESS 2.17)
     set(extra_link_libs "${extra_link_libs} -lrt")
 endif()
@@ -141,8 +146,8 @@ set(common_cmake_args
     -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
     "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
     "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
-    "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fPIC ${extra_cpp_flags}"
-    "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -fno-omit-frame-pointer -fPIC"
+    "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fPIC ${extra_cpp_flags} ${ISA_FLAGS}"
+    "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -fno-omit-frame-pointer -fPIC ${ISA_FLAGS}"
     "-DCMAKE_EXE_LINKER_FLAGS=${extra_link_libs} -Wl,-rpath=\$ORIGIN/../lib:\$ORIGIN/../lib64"
     -DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath=\$ORIGIN:\$ORIGIN/../3rd:\$ORIGIN/../lib64:\$ORIGIN/../lib
     -DCMAKE_INCLUDE_PATH=${CMAKE_INSTALL_PREFIX}/include
@@ -180,8 +185,8 @@ set(common_configure_envs
     "env"
     "CC=${CMAKE_C_COMPILER}"
     "CXX=${CMAKE_CXX_COMPILER}"
-    "CFLAGS=${CMAKE_C_FLAGS} -fcommon -fno-omit-frame-pointer -fPIC -O2 -D_DEFAULT_SOURCE -D_GNU_SOURCE ${extra_cpp_flags}"
-    "CXXFLAGS=${CMAKE_CXX_FLAGS} -fcommon -fno-omit-frame-pointer -fPIC -O2 -D_DEFAULT_SOURCE -D_GNU_SOURCE ${extra_cpp_flags}"
+    "CFLAGS=${CMAKE_C_FLAGS} -fcommon -fno-omit-frame-pointer -fPIC -O2 -D_DEFAULT_SOURCE -D_GNU_SOURCE ${extra_cpp_flags} ${ISA_FLAGS}"
+    "CXXFLAGS=${CMAKE_CXX_FLAGS} -fcommon -fno-omit-frame-pointer -fPIC -O2 -D_DEFAULT_SOURCE -D_GNU_SOURCE ${extra_cpp_flags} ${ISA_FLAGS}"
     "CPPFLAGS=-isystem ${CMAKE_INSTALL_PREFIX}/include -I${BERKELEYDB_INCLUDE_DIR} ${extra_cpp_flags}"
     "LDFLAGS=-Wl,-rpath=\\\\$\\$ORIGIN ${ld_flags}"
     "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/lib64"
@@ -196,13 +201,12 @@ set(ALL_TARGETS
     boost
     #breakpad
     bzip2
-    cachelib
+    #cachelib
     cyrus-sasl
     date
     double-conversion
     duckdb
     fatal
-    fbthrift
     fizz
     flex
     fmt
@@ -330,7 +334,6 @@ maybe_add_dependencies(s2geometry googletest glog openssl abseil)
 maybe_add_dependencies(folly glog boost double-conversion openssl libevent lzma zstd snappy lz4 libunwind fmt sodium jemalloc libdwarf)
 maybe_add_dependencies(fizz folly)
 maybe_add_dependencies(wangle folly fizz)
-maybe_add_dependencies(fbthrift folly bison flex mstch zlib zstd wangle fatal)
 maybe_add_dependencies(proxygen wangle libunwind gperf)
 maybe_add_dependencies(rocksdb snappy zlib zstd bzip2 lz4 lzma libunwind)
 maybe_add_dependencies(cachelib fbthrift sparsemap fizz googletest)
@@ -345,24 +348,6 @@ maybe_add_dependencies(re2 abseil)
 maybe_add_dependencies(grpc protobuf re2 c-ares openssl)
 maybe_add_dependencies(faiss openblas)
 
-#if (EXISTS ${CMAKE_INSTALL_PREFIX}/lib64)
-    #add_custom_target(
-        #strip-archives ALL
-        #COMMAND
-            #strip --strip-unneeded ${CMAKE_INSTALL_PREFIX}/lib/*.a
-        #COMMAND
-            #strip --strip-unneeded ${CMAKE_INSTALL_PREFIX}/lib64/*.a
-        #DEPENDS ${ALL_TARGETS}
-    #)
-#else()
-    #add_custom_target(
-        #strip-archives ALL
-        #COMMAND
-            #strip --strip-unneeded ${CMAKE_INSTALL_PREFIX}/lib/*.a
-        #DEPENDS ${ALL_TARGETS}
-    #)
-#endif()
-
 add_custom_target(
     clean-all
     DEPENDS ${CLEAN_TARGETS}

project/externals/boost.cmake

@@ -43,7 +43,7 @@ ExternalProject_Add(
             --disable-icu
             include=${CMAKE_INSTALL_PREFIX}/include
             linkflags=-L${CMAKE_INSTALL_PREFIX}/lib
-            "cxxflags=-fPIC ${extra_cpp_flags}"
+            "cxxflags=-fPIC ${extra_cpp_flags} ${ISA_FLAGS}"
             runtime-link=shared
             link=shared
             variant=release

project/externals/fbthrift.cmake

@@ -19,7 +19,7 @@ ExternalProject_Add(
         ${common_cmake_args}
         -DCMAKE_BUILD_TYPE=Release
         -DBoost_NO_BOOST_CMAKE=ON
-        "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -fPIC -D__STDC_FORMAT_MACROS=1 -DFOLLY_HAVE_CLOCK_GETTIME -D__USE_POSIX199309 ${extra_cpp_flags}"
+        "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -fPIC -D__STDC_FORMAT_MACROS=1 -DFOLLY_HAVE_CLOCK_GETTIME -D__USE_POSIX199309 ${extra_cpp_flags} ${ISA_FLAGS}"
         -DPACKAGE_VERSION=2022.12.26
         -DFOLLY_CXX_FLAGS=-Wno-error
     BUILD_COMMAND make -s -j${BUILDING_JOBS_NUM}

project/externals/folly.cmake

@@ -19,7 +19,7 @@ ExternalProject_Add(
     BUILD_IN_SOURCE 1
     INSTALL_COMMAND
         make install -s
-             MOREFLAGS=-fPIC
+             "MOREFLAGS=-fPIC ${ISA_FLAGS}"
              "LN_S=ln -sf"
              BUILD_STATIC=no
              -j${BUILDING_JOBS_NUM}

project/externals/lz4.cmake

@@ -33,7 +33,7 @@ ExternalProject_Add(
         -DFAIL_ON_WARNINGS=OFF
         -DCMAKE_BUILD_TYPE=Release
         "-DCMAKE_EXE_LINKER_FLAGS=${extra_lib_dirs} -lbz2 -lsnappy -lzstd"
-        "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -D NPERF_CONTEXT"
+        "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -D NPERF_CONTEXT ${ISA_FLAGS}"
         "-DCMAKE_SHARED_LINKER_FLAGS=${extra_lib_dirs} -Wl,-rpath=\$ORIGIN:\$ORIGIN/../3rd"
     BUILD_IN_SOURCE 1
     BUILD_COMMAND make -s -j${BUILDING_JOBS_NUM}