From: dhirajverma Date: Wed, 5 May 2021 10:16:10 +0000 (+0530) Subject: RIC-780 Updating Pistache Library X-Git-Tag: 5.4.9~7 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=af4da6d39f2b5bd1f8b1263fb2e3eb598803f5d0;p=ric-plt%2Fe2.git RIC-780 Updating Pistache Library Change-Id: I1d765eeb46a59400ad55398e1a886e98911df3eb Signed-off-by: dhirajverma --- diff --git a/RIC-E2-TERMINATION/CMakeLists.txt b/RIC-E2-TERMINATION/CMakeLists.txt index 95986fe..d996706 100644 --- a/RIC-E2-TERMINATION/CMakeLists.txt +++ b/RIC-E2-TERMINATION/CMakeLists.txt @@ -155,7 +155,7 @@ add_executable(sctpClient #RIC-E2-TERMINATION/TEST/T1/Test1.cpp #RIC-E2-TERMINATION/TEST/T1/ ) -target_link_libraries(sctpClient libpistache.a) +target_link_libraries(sctpClient libpistache.so) target_link_libraries(sctpClient librmr_si.a) add_executable(setUpMessages @@ -198,4 +198,4 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug") SETUP_TARGET_FOR_COVERAGE_LCOV(NAME e2_coverage EXECUTABLE e2 DEPENDENCIES e2) -endif () \ No newline at end of file +endif () diff --git a/RIC-E2-TERMINATION/Dockerfile b/RIC-E2-TERMINATION/Dockerfile index 910cba0..d6272c0 100644 --- a/RIC-E2-TERMINATION/Dockerfile +++ b/RIC-E2-TERMINATION/Dockerfile @@ -45,11 +45,13 @@ RUN mv /opt/e2/RIC-E2-TERMINATION/CMakeLists.txt /opt/e2/ && cat /opt/e2/RIC-E2- && wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/mdclog-dev_0.0.4-1_amd64.deb/download.deb \ && dpkg -i mdclog-dev_0.0.4-1_amd64.deb \ && apt-get update && apt-get install -y libcurl4-gnutls-dev gawk libtbb-dev libtbb-doc libtbb2 libtbb2-dbg \ - && cd /opt/e2/RIC-E2-TERMINATION/3rdparty && git clone https://github.com/oktal/pistache.git && cd pistache \ - && git submodule update --init && mkdir build && cd build \ - && cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DPISTACHE_BUILD_DOCS=false \ - -DPISTACHE_USE_SSL=false -DPISTACHE_BUILD_TESTS=false -DCMAKE_INSTALL_PREFIX=/usr/local ../ \ - && make -j && make install && ldconfig \ + && apt-get install -y python3 python3-pip python3-setuptools python3-wheel ninja-build \ + && pip3 install meson \ + && cd /opt/e2/RIC-E2-TERMINATION/3rdparty && git clone https://github.com/pistacheio/pistache.git && cd pistache \ + && meson setup build \ + --buildtype=release -DPISTACHE_USE_SSL=false -DPISTACHE_BUILD_EXAMPLES=false -DPISTACHE_BUILD_TESTS=false \ + -DPISTACHE_BUILD_DOCS=false --prefix=/usr/local \ + && meson compile -C build && meson install -C build && ldconfig \ && cd /opt/e2/RIC-E2-TERMINATION/3rdparty && git clone -v https://github.com/jupp0r/prometheus-cpp.git \ && cd prometheus-cpp && git submodule init && git submodule update && mkdir build && cd build \ && cmake .. -DBUILD_SHARED_LIBS=OFF && make -j 4 && make install && ldconfig \