Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug/1638 fix cmake build #1643

Merged
merged 5 commits into from
Sep 12, 2023
Merged

Bug/1638 fix cmake build #1643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a832517
1638 fix cmake build and disable tests id deps
olehnikolaiev Sep 7, 2023
794dd78
remove tests from deps
olehnikolaiev Sep 7, 2023
c7911bf
Merge branch 'develop' into bug/1638-fix-cmake-build
olehnikolaiev Sep 11, 2023
1d6c662
Merge branch 'develop' into bug/1638-fix-cmake-build
olehnikolaiev Sep 11, 2023
54ad4d4
Merge branch 'develop' into bug/1638-fix-cmake-build
olehnikolaiev Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions deps/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ if [ "$WITH_UNWIND" = "yes" ];
#eval autoheader
#eval automake --add-missing
eval autoreconf -i
eval ./configure --disable-shared --prefix="$INSTALL_ROOT"
eval ./configure --disable-shared --disable-tests --prefix="$INSTALL_ROOT"
cd ..
fi
echo -e "${COLOR_INFO}building it${COLOR_DOTS}...${COLOR_RESET}"
Expand Down Expand Up @@ -1113,7 +1113,7 @@ then
# ..
#cd ../..
eval ./autogen.sh
eval ./configure "${CONF_CROSSCOMPILING_OPTS_GENERIC}" --enable-static --disable-shared --prefix="$INSTALL_ROOT" "${CONF_DEBUG_OPTIONS}"
eval ./configure "${CONF_CROSSCOMPILING_OPTS_GENERIC}" --enable-static --disable-shared --disable-samples --prefix="$INSTALL_ROOT" "${CONF_DEBUG_OPTIONS}"
cd ..
fi
#cd libevent/build
Expand Down Expand Up @@ -1142,7 +1142,7 @@ then
if [ ! -f "libuv-from-git.tar.gz" ];
then
echo -e "${COLOR_INFO}getting it from git${COLOR_DOTS}...${COLOR_RESET}"
eval git clone https://github.com/libuv/libuv.git
eval git clone https://github.com/libuv/libuv.git
cd libuv
eval git checkout v1.x
eval git pull
Expand Down Expand Up @@ -1191,11 +1191,11 @@ then
if [ ! -f "libwebsockets-from-git.tar.gz" ];
then
echo -e "${COLOR_INFO}downloading it${COLOR_DOTS}...${COLOR_RESET}"
eval git clone https://github.com/warmcat/libwebsockets.git
eval git clone https://github.com/warmcat/libwebsockets.git
eval cd libwebsockets
# eval git checkout v4.1-stable
eval git checkout v4.3-stable
eval git pull
# eval git checkout v4.1-stable
eval git checkout v4.3-stable
eval git pull
cd ..
echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
eval tar -czf libwebsockets-from-git.tar.gz ./libwebsockets
Expand Down Expand Up @@ -1391,7 +1391,7 @@ then
eval "$WGET" https://boostorg.jfrog.io/artifactory/main/release/1.68.0/source/boost_1_68_0.tar.bz2
fi
echo -e "${COLOR_INFO}unpacking it${COLOR_DOTS}...${COLOR_RESET}"
eval tar -xf boost_1_68_0.tar.bz2
eval tar -xf boost_1_68_0.tar.bz2
fi
cd boost_1_68_0
echo -e "${COLOR_INFO}configuring and building it${COLOR_DOTS}...${COLOR_RESET}"
Expand Down Expand Up @@ -1996,10 +1996,10 @@ then
then
echo -e "${COLOR_INFO}getting it from git${COLOR_DOTS}...${COLOR_RESET}"
eval git clone https://github.com/google/glog.git --recursive
cd glog
eval git checkout ee6faf13b20de9536f456bd84584f4ab4db1ceb4
cd ..
echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
cd glog
eval git checkout ee6faf13b20de9536f456bd84584f4ab4db1ceb4
cd ..
echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
eval tar -czf glog-from-git.tar.gz ./glog
else
echo -e "${COLOR_INFO}unpacking it${COLOR_DOTS}...${COLOR_RESET}"
Expand All @@ -2010,7 +2010,7 @@ then
eval mkdir -p build
cd build
eval "$CMAKE" "${CMAKE_CROSSCOMPILING_OPTS}" -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT" -DCMAKE_BUILD_TYPE="$TOP_CMAKE_BUILD_TYPE" \
-DBUILD_SHARED_LIBS=OFF -DWITH_UNWIND=OFF \
-DBUILD_SHARED_LIBS=OFF -DWITH_UNWIND=OFF -DWITH_GTEST=OFF \
..
cd ..
else
Expand Down Expand Up @@ -2077,11 +2077,11 @@ then
then
echo -e "${COLOR_INFO}getting it from git${COLOR_DOTS}...${COLOR_RESET}"
eval git clone https://github.com/facebook/folly.git --recursive
cd folly
eval git checkout 5c8fc1b622422a1c73f46d6fb51ac1164d8efb0f
cd ..
echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
eval tar -czf folly-from-git.tar.gz ./folly
cd folly
eval git checkout 5c8fc1b622422a1c73f46d6fb51ac1164d8efb0f
cd ..
echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
eval tar -czf folly-from-git.tar.gz ./folly
else
echo -e "${COLOR_INFO}unpacking it${COLOR_DOTS}...${COLOR_RESET}"
eval tar -xzf folly-from-git.tar.gz
Expand Down Expand Up @@ -2165,10 +2165,10 @@ then
then
echo -e "${COLOR_INFO}getting it from git${COLOR_DOTS}...${COLOR_RESET}"
eval git clone https://github.com/google/googletest.git --recursive
cd googletest
eval git checkout 4c5650f68866e3c2e60361d5c4c95c6f335fb64b
cd ..
echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
cd googletest
eval git checkout 4c5650f68866e3c2e60361d5c4c95c6f335fb64b
cd ..
echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
eval tar -czf gtest-from-git.tar.gz ./googletest
else
echo -e "${COLOR_INFO}unpacking it${COLOR_DOTS}...${COLOR_RESET}"
Expand Down Expand Up @@ -2208,10 +2208,10 @@ then
then
echo -e "${COLOR_INFO}getting it from git${COLOR_DOTS}...${COLOR_RESET}"
eval git clone https://github.com/facebookincubator/fizz.git --recursive
cd fizz
eval git checkout 93003f4161f7cebe1c121b3232215db8314c2ce7
cd ..
echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
cd fizz
eval git checkout 93003f4161f7cebe1c121b3232215db8314c2ce7
cd ..
echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
eval tar -czf fizz-from-git.tar.gz ./fizz
else
echo -e "${COLOR_INFO}unpacking it${COLOR_DOTS}...${COLOR_RESET}"
Expand Down Expand Up @@ -2253,10 +2253,10 @@ then
then
echo -e "${COLOR_INFO}getting it from git${COLOR_DOTS}...${COLOR_RESET}"
eval git clone https://github.com/facebook/wangle.git --recursive
cd wangle
eval git checkout 7249d3f8d18bcd4bc13649d13654ccb2a771f7b3
cd ..
echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
cd wangle
eval git checkout 7249d3f8d18bcd4bc13649d13654ccb2a771f7b3
cd ..
echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
eval tar -czf wangle-from-git.tar.gz ./wangle
else
echo -e "${COLOR_INFO}unpacking it${COLOR_DOTS}...${COLOR_RESET}"
Expand Down
2 changes: 1 addition & 1 deletion skaled/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ target_link_libraries(
devcore
Boost::program_options
skutils
"${DEPS_INSTALL_ROOT}/lib/liblzma.a"
"${DEPS_INSTALL_ROOT}/lib/libunwind.a"
"${DEPS_INSTALL_ROOT}/lib/liblzma.a"
pthread
idn2
batched-io
Expand Down
2 changes: 1 addition & 1 deletion storage_benchmark/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ target_link_libraries(
historic
skutils
devcore
"${DEPS_INSTALL_ROOT}/lib/liblzma.a"
"${DEPS_INSTALL_ROOT}/lib/libunwind.a"
"${DEPS_INSTALL_ROOT}/lib/liblzma.a"
)

#target_include_directories(evm_benchmark PRIVATE ../utils)
Expand Down
Loading