diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index b193d5d..e7382b5 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -58,9 +58,10 @@ COPY --from=build /work/dist_amd64/lib/libsua.so /sua/lib/ COPY --from=build /work/build_amd64/glib/gio/libgio-2.0.so.0 /sua/lib/ COPY --from=build /work/build_amd64/glib/gobject/libgobject-2.0.so.0 /sua/lib/ COPY --from=build /work/build_amd64/glib/glib/libglib-2.0.so.0 /sua/lib/ -COPY --from=build /work/build_amd64/glib/gmodule/libgmodule-2.0.so.0 /sua/lib/ -COPY --from=build /work/build_amd64/glib/subprojects/libffi/src/libffi.so.7 /sua/lib/ -COPY --from=build /work/build_amd64/glib/subprojects/zlib-1.2.11/libz.so /sua/lib/ +COPY --from=build /work/build_amd64/glib/gmodule/libgmodule-2.0.so.0 /sua/lib/ +COPY --from=build /work/build_amd64/glib/subprojects/libffi/src/libffi.so.7 /sua/lib/ +COPY --from=build /work/build_amd64/glib/subprojects/pcre2-10.40/libpcre2-8.so /sua/lib/ +COPY --from=build /work/build_amd64/glib/subprojects/zlib-1.2.11/libz.so /sua/lib/ COPY --from=build /etc/ssl/certs /etc/ssl/certs/ COPY --from=build /usr/share/ca-certificates /usr/share/ca-certificates COPY --from=build /lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2 diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 4513afc..75e3a68 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -58,9 +58,10 @@ COPY --from=build /work/dist_arm64/lib/libsua.so /sua/lib/ COPY --from=build /work/build_arm64/glib/gio/libgio-2.0.so.0 /sua/lib/ COPY --from=build /work/build_arm64/glib/gobject/libgobject-2.0.so.0 /sua/lib/ COPY --from=build /work/build_arm64/glib/glib/libglib-2.0.so.0 /sua/lib/ -COPY --from=build /work/build_arm64/glib/gmodule/libgmodule-2.0.so.0 /sua/lib/ -COPY --from=build /work/build_arm64/glib/subprojects/libffi/src/libffi.so.7 /sua/lib/ -COPY --from=build /work/build_arm64/glib/subprojects/zlib-1.2.11/libz.so /sua/lib/ +COPY --from=build /work/build_arm64/glib/gmodule/libgmodule-2.0.so.0 /sua/lib/ +COPY --from=build /work/build_arm64/glib/subprojects/libffi/src/libffi.so.7 /sua/lib/ +COPY --from=build /work/build_amd64/glib/subprojects/pcre2-10.40/libpcre2-8.so /sua/lib/ +COPY --from=build /work/build_arm64/glib/subprojects/zlib-1.2.11/libz.so /sua/lib/ COPY --from=build /etc/ssl/certs /etc/ssl/certs/ COPY --from=build /usr/share/ca-certificates /usr/share/ca-certificates COPY --from=build /usr/aarch64-linux-gnu/lib/ld-linux-aarch64.so.1 /lib/ld-linux-aarch64.so.1 diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index b3158a2..7fbd896 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -55,6 +55,12 @@ set_property( PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/glib/subprojects/libffi/src/libffi.so ) +add_library(pcre_lib SHARED IMPORTED) +set_property( + TARGET pcre_lib + PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/glib/subprojects/pcre2-10.40/libpcre2-8.so +) + add_library(z_lib SHARED IMPORTED) set_property( TARGET z_lib diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ede9287..fc81d3b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -48,6 +48,7 @@ target_link_libraries(${PROJECT_NAME} gmodule_lib glib_lib ffi_lib + pcre_lib z_lib ${SUA_PLATFORM_LIBS} ssl_lib