Skip to content

Commit f22c749

Browse files
Added libpcre to dependencies
1 parent 893446e commit f22c749

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

Dockerfile.amd64

+4-3
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,10 @@ COPY --from=build /work/dist_amd64/lib/libsua.so /sua/lib/
5858
COPY --from=build /work/build_amd64/glib/gio/libgio-2.0.so.0 /sua/lib/
5959
COPY --from=build /work/build_amd64/glib/gobject/libgobject-2.0.so.0 /sua/lib/
6060
COPY --from=build /work/build_amd64/glib/glib/libglib-2.0.so.0 /sua/lib/
61-
COPY --from=build /work/build_amd64/glib/gmodule/libgmodule-2.0.so.0 /sua/lib/
62-
COPY --from=build /work/build_amd64/glib/subprojects/libffi/src/libffi.so.7 /sua/lib/
63-
COPY --from=build /work/build_amd64/glib/subprojects/zlib-1.2.11/libz.so /sua/lib/
61+
COPY --from=build /work/build_amd64/glib/gmodule/libgmodule-2.0.so.0 /sua/lib/
62+
COPY --from=build /work/build_amd64/glib/subprojects/libffi/src/libffi.so.7 /sua/lib/
63+
COPY --from=build /work/build_amd64/glib/subprojects/pcre2-10.40/libpcre2-8.so /sua/lib/
64+
COPY --from=build /work/build_amd64/glib/subprojects/zlib-1.2.11/libz.so /sua/lib/
6465
COPY --from=build /etc/ssl/certs /etc/ssl/certs/
6566
COPY --from=build /usr/share/ca-certificates /usr/share/ca-certificates
6667
COPY --from=build /lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2

Dockerfile.arm64

+4-3
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,10 @@ COPY --from=build /work/dist_arm64/lib/libsua.so /sua/lib/
5858
COPY --from=build /work/build_arm64/glib/gio/libgio-2.0.so.0 /sua/lib/
5959
COPY --from=build /work/build_arm64/glib/gobject/libgobject-2.0.so.0 /sua/lib/
6060
COPY --from=build /work/build_arm64/glib/glib/libglib-2.0.so.0 /sua/lib/
61-
COPY --from=build /work/build_arm64/glib/gmodule/libgmodule-2.0.so.0 /sua/lib/
62-
COPY --from=build /work/build_arm64/glib/subprojects/libffi/src/libffi.so.7 /sua/lib/
63-
COPY --from=build /work/build_arm64/glib/subprojects/zlib-1.2.11/libz.so /sua/lib/
61+
COPY --from=build /work/build_arm64/glib/gmodule/libgmodule-2.0.so.0 /sua/lib/
62+
COPY --from=build /work/build_arm64/glib/subprojects/libffi/src/libffi.so.7 /sua/lib/
63+
COPY --from=build /work/build_arm64/glib/subprojects/pcre2-10.40/libpcre2-8.so /sua/lib/
64+
COPY --from=build /work/build_arm64/glib/subprojects/zlib-1.2.11/libz.so /sua/lib/
6465
COPY --from=build /etc/ssl/certs /etc/ssl/certs/
6566
COPY --from=build /usr/share/ca-certificates /usr/share/ca-certificates
6667
COPY --from=build /usr/aarch64-linux-gnu/lib/ld-linux-aarch64.so.1 /lib/ld-linux-aarch64.so.1

cmake/dependencies.cmake

+6
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ set_property(
5555
PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/glib/subprojects/libffi/src/libffi.so
5656
)
5757

58+
add_library(pcre_lib SHARED IMPORTED)
59+
set_property(
60+
TARGET pcre_lib
61+
PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/glib/subprojects/pcre2-10.40/libpcre2-8.so
62+
)
63+
5864
add_library(z_lib SHARED IMPORTED)
5965
set_property(
6066
TARGET z_lib

src/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ target_link_libraries(${PROJECT_NAME}
4848
gmodule_lib
4949
glib_lib
5050
ffi_lib
51+
pcre_lib
5152
z_lib
5253
${SUA_PLATFORM_LIBS}
5354
ssl_lib

0 commit comments

Comments
 (0)