From b3676923c3d8d9aad125d6b7293ff5acdf02e8be Mon Sep 17 00:00:00 2001 From: Guofang Date: Thu, 22 Oct 2026 15:22:33 +0800 Subject: [PATCH] Update CMake installation paths to use /usr/local for libraries and pkgconfig --- debian13/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/debian13/Dockerfile b/debian13/Dockerfile index 2e698cf..6059efb 100644 --- a/debian13/Dockerfile +++ b/debian13/Dockerfile @@ -799,10 +799,10 @@ RUN curl --fail --location --output thrift.tar.gz \ -DBUILD_SHARED_LIBS=OFF \ -DBUILD_TESTING=OFF \ -DBUILD_TUTORIALS=OFF \ - -DCMAKE_INSTALL_DIR=lib/x86_64-linux-gnu/cmake \ + -DCMAKE_INSTALL_DIR=/usr/local/lib/x86_64-linux-gnu/cmake \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DLIB_INSTALL_DIR=lib/x86_64-linux-gnu \ - -DPKGCONFIG_INSTALL_DIR=lib/x86_64-linux-gnu/pkgconfig \ + -DLIB_INSTALL_DIR=/usr/local/lib/x86_64-linux-gnu \ + -DPKGCONFIG_INSTALL_DIR=/usr/local/lib/x86_64-linux-gnu/pkgconfig \ -DWITH_AS3=OFF \ -DWITH_C_GLIB=OFF \ -DWITH_CPP=ON \ @@ -815,6 +815,8 @@ RUN curl --fail --location --output thrift.tar.gz \ -DWITH_QT5=OFF \ -DWITH_ZLIB=OFF \ && cmake --build build --parallel "$(nproc)" --target install \ + && sed -i 's|^libdir=.*|libdir=${prefix}/lib/x86_64-linux-gnu|' \ + /usr/local/lib/x86_64-linux-gnu/pkgconfig/thrift.pc \ && rm -rf build src RUN curl --fail --location --output snappy.tar.gz \