From 384770c8410ee77c6a3253cd872dbf6dc8c6f717 Mon Sep 17 00:00:00 2001 From: Luca Comellini <luca.com@gmail.com> Date: Wed, 24 Jul 2024 17:31:38 -0700 Subject: [PATCH] test --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3a50fb16..49335ab0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -150,14 +150,14 @@ RUN xx-info env && git clone --depth 1 -b $YAML_CPP_VERSION https://github.com/j -DCMAKE_BUILD_TYPE=Release \ -DYAML_CPP_BUILD_TESTS=OFF \ -DYAML_CPP_BUILD_TOOLS=OFF \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON .. \ + -DYAML_ENABLE_PIC=ON .. \ && make -j$(nproc) install \ && xx-verify /usr/local/lib/libyaml-cpp.so RUN git clone --depth 1 -b $JAEGER_CPP_VERSION https://github.com/jaegertracing/jaeger-client-cpp \ && cd jaeger-client-cpp \ && sed -i 's/hunter_add_package(yaml-cpp)/#hunter_add_package(yaml-cpp)/' CMakeLists.txt \ - && sed -i 's/yaml-cpp::yaml-cpp/yaml-cpp/' CMakeLists.txt \ + # && sed -i 's/yaml-cpp::yaml-cpp/yaml-cpp/' CMakeLists.txt \ # Hunter doesn't read CMake variables, so we need to set them manually && printf "%s\n" "" "set(CMAKE_C_COMPILER clang)" "set(CMAKE_CXX_COMPILER clang++)" \ "set(CMAKE_ASM_COMPILER clang)" "set(PKG_CONFIG_EXECUTABLE $(xx-clang --print-prog-name=pkg-config))" \