Skip to content

Commit

Permalink
feat: Fix some errors when compiling on Ubuntu:22.04
Browse files Browse the repository at this point in the history
  • Loading branch information
Shouren committed Dec 5, 2024
1 parent 6eeaa26 commit c49fa49
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ LABEL org.opencontainers.image.source https://github.com/4paradigm/OpenMLDB
COPY ./*.sh /

RUN apt update -y && \
apt install -y build-essential python3-dev openjdk-11-jdk flex doxygen lcov git && \
apt install -y build-essential python3-dev openjdk-11-jdk flex doxygen lcov git curl && \
apt clean cache && \
curl -Lo zookeeper.tar.gz https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz && \
mkdir -p /deps/src && \
tar xzf zookeeper.tar.gz -C /deps/src && \
tar xf zookeeper.tar.gz -C /deps/src && \
/setup_deps.sh -z "$ZETASQL_VERSION" -t "$THIRDPARTY_VERSION" && \
rm -v /*.sh

Expand Down
4 changes: 4 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ function(compile_lib LIB_NAME DIR DEPEND_FILE_LIST)
set(FILE_STR_LIST "${FILE_STR_LIST} ${DEPEND_FILE_LIST}")
string(REPLACE " " ";" FILE_LIST ${FILE_STR_LIST})
add_library(${LIB_NAME} STATIC ${FILE_LIST} $<TARGET_OBJECTS:openmldb_proto>)
target_compile_options(${LIB_NAME} PRIVATE
$<$<COMPILE_LANGUAGE:CXX>:-Wno-error=nonnull>
$<$<COMPILE_LANGUAGE:C>:-Wno-error=nonnull>
)
endfunction(compile_lib)

set(TEST_LIBS
Expand Down
1 change: 1 addition & 0 deletions src/client/ns_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <algorithm>
#include <map>
#include <memory>
#include <optional>
#include <set>
#include <string>
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion third-party/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ set(MAKEOPTS "$ENV{MAKEOPTS}" CACHE STRING "Extra options to make")
message(STATUS "Install bundled dependencies into ${DEPS_INSTALL_DIR}")

set(HYBRIDSQL_ASSERTS_HOME https://github.com/4paradigm/hybridsql-asserts)
set(HYBRIDSQL_ASSERTS_VERSION 0.7.0)
set(HYBRIDSQL_ASSERTS_VERSION 0.7.1)

function(get_linux_lsb_release_information)
execute_process(COMMAND bash ${CMAKE_SOURCE_DIR}/get-lsb-release.sh
Expand Down

0 comments on commit c49fa49

Please sign in to comment.