Skip to content

Commit d8d9354

Browse files
OleksandrChaikaOleksandrChaika
authored
Update 3rdparty dependencies to latest versions (eclipse-leda#44)
* Updated spdlog to v1.12.0 * Updated nlohmann-json to v3.11.2 * Updated googletest to v1.14 * Updated libcurl to v8.3.0 * Updated glib to v2.78.0 * Updated openssl to v3.1.2 * Updated paho.mqtt.c to v1.3.12 * Updated paho.mqtt.cpp to v1.2.0 * Update versions of shared libraries in build scripts
1 parent fcb7ff5 commit d8d9354

File tree

14 files changed

+30
-20
lines changed

14 files changed

+30
-20
lines changed

Diff for: ‎.github/actions/build-native-binary/action.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ runs:
135135
if: ${{ inputs.arch == 'amd64' }}
136136
run: |
137137
cd dist_${{ inputs.arch }}/utest
138-
./TestSelfUpdateAgent > ../../unit_tests_report_${{ inputs.arch }}.txt --gtest_output=xml:../../unit_tests_report_${{ inputs.arch }}.xml
138+
LD_LIBRARY_PATH=../lib ./TestSelfUpdateAgent > ../../unit_tests_report_${{ inputs.arch }}.txt --gtest_output=xml:../../unit_tests_report_${{ inputs.arch }}.xml
139139
shell: bash
140140

141141
- uses: uraimo/run-on-arch-action@v2
@@ -163,7 +163,7 @@ runs:
163163
if: ${{ inputs.arch == 'amd64' }}
164164
run: |
165165
cd dist_${{ inputs.arch }}_codecov/utest
166-
./TestSelfUpdateAgent
166+
LD_LIBRARY_PATH=../lib ./TestSelfUpdateAgent
167167
shell: bash
168168

169169
- name: Generate code-coverage report

Diff for: ‎3rdparty/CMakeLists.txt

+5-4
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ install(
3232
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
3333
)
3434

35-
install(FILES ${CMAKE_BINARY_DIR}/glib/gio/libgio-2.0.so.0.7300.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgio-2.0.so.0)
36-
install(FILES ${CMAKE_BINARY_DIR}/glib/glib/libglib-2.0.so.0.7300.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libglib-2.0.so.0)
37-
install(FILES ${CMAKE_BINARY_DIR}/glib/gmodule/libgmodule-2.0.so.0.7300.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgmodule-2.0.so.0)
38-
install(FILES ${CMAKE_BINARY_DIR}/glib/gobject/libgobject-2.0.so.0.7300.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgobject-2.0.so.0)
35+
install(FILES ${CMAKE_BINARY_DIR}/glib/gio/libgio-2.0.so.0.7800.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgio-2.0.so.0)
36+
install(FILES ${CMAKE_BINARY_DIR}/glib/glib/libglib-2.0.so.0.7800.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libglib-2.0.so.0)
37+
install(FILES ${CMAKE_BINARY_DIR}/glib/gmodule/libgmodule-2.0.so.0.7800.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgmodule-2.0.so.0)
38+
install(FILES ${CMAKE_BINARY_DIR}/glib/gobject/libgobject-2.0.so.0.7800.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgobject-2.0.so.0)
3939
install(FILES ${CMAKE_BINARY_DIR}/glib/subprojects/libffi/src/libffi.so.7.1.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libffi.so.7)
40+
install(FILES ${CMAKE_BINARY_DIR}/glib/subprojects/proxy-libintl/libintl.so.8 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libintl.so.8)

Diff for: ‎3rdparty/curl

Submodule curl updated 980 files

Diff for: ‎3rdparty/glib

Submodule glib updated 1383 files

Diff for: ‎3rdparty/googletest

Submodule googletest updated 151 files

Diff for: ‎3rdparty/nlohmann-json

Submodule nlohmann-json updated 101 files

Diff for: ‎3rdparty/openssl

Submodule openssl updated 1731 files

Diff for: ‎3rdparty/paho.mqtt.c

Diff for: ‎3rdparty/paho.mqtt.cpp

Diff for: ‎3rdparty/spdlog

Submodule spdlog updated 67 files

Diff for: ‎Dockerfile.amd64

+4-3
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,10 @@ COPY --from=build /work/dist_amd64/lib/libsua.so /sua/lib/
7676
COPY --from=build /work/build_amd64/glib/gio/libgio-2.0.so.0 /sua/lib/
7777
COPY --from=build /work/build_amd64/glib/gobject/libgobject-2.0.so.0 /sua/lib/
7878
COPY --from=build /work/build_amd64/glib/glib/libglib-2.0.so.0 /sua/lib/
79-
COPY --from=build /work/build_amd64/glib/gmodule/libgmodule-2.0.so.0 /sua/lib/
80-
COPY --from=build /work/build_amd64/glib/subprojects/libffi/src/libffi.so.7 /sua/lib/
81-
COPY --from=build /work/build_amd64/glib/subprojects/zlib-1.2.11/libz.so /sua/lib/
79+
COPY --from=build /work/build_amd64/glib/gmodule/libgmodule-2.0.so.0 /sua/lib/
80+
COPY --from=build /work/build_amd64/glib/subprojects/libffi/src/libffi.so.7 /sua/lib/
81+
COPY --from=build /work/build_amd64/glib/subprojects/zlib-1.2.11/libz.so /sua/lib/
82+
COPY --from=build /work/build_amd64/glib/subprojects/proxy-libintl/libintl.so.8 /sua/lib/
8283
COPY --from=build /etc/ssl/certs /etc/ssl/certs/
8384
COPY --from=build /usr/share/ca-certificates /usr/share/ca-certificates
8485
COPY --from=build /lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2

Diff for: ‎Dockerfile.arm64

+4-3
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,10 @@ COPY --from=build /work/dist_arm64/lib/libsua.so /sua/lib/
7676
COPY --from=build /work/build_arm64/glib/gio/libgio-2.0.so.0 /sua/lib/
7777
COPY --from=build /work/build_arm64/glib/gobject/libgobject-2.0.so.0 /sua/lib/
7878
COPY --from=build /work/build_arm64/glib/glib/libglib-2.0.so.0 /sua/lib/
79-
COPY --from=build /work/build_arm64/glib/gmodule/libgmodule-2.0.so.0 /sua/lib/
80-
COPY --from=build /work/build_arm64/glib/subprojects/libffi/src/libffi.so.7 /sua/lib/
81-
COPY --from=build /work/build_arm64/glib/subprojects/zlib-1.2.11/libz.so /sua/lib/
79+
COPY --from=build /work/build_arm64/glib/gmodule/libgmodule-2.0.so.0 /sua/lib/
80+
COPY --from=build /work/build_arm64/glib/subprojects/libffi/src/libffi.so.7 /sua/lib/
81+
COPY --from=build /work/build_arm64/glib/subprojects/zlib-1.2.11/libz.so /sua/lib/
82+
COPY --from=build /work/build_arm64/glib/subprojects/proxy-libintl/libintl.so.8 /sua/lib/
8283
COPY --from=build /etc/ssl/certs /etc/ssl/certs/
8384
COPY --from=build /usr/share/ca-certificates /usr/share/ca-certificates
8485
COPY --from=build /usr/aarch64-linux-gnu/lib/ld-linux-aarch64.so.1 /lib/ld-linux-aarch64.so.1

Diff for: ‎cmake/dependencies.cmake

+6
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,9 @@ set_property(
5959
TARGET z_lib
6060
PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/glib/subprojects/zlib-1.2.11/libz.so
6161
)
62+
63+
add_library(intl_lib SHARED IMPORTED)
64+
set_property(
65+
TARGET intl_lib
66+
PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/glib/subprojects/proxy-libintl/libintl.so
67+
)

Diff for: ‎src/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ target_link_libraries(${PROJECT_NAME}
5858
glib_lib
5959
ffi_lib
6060
z_lib
61+
intl_lib
6162
${SUA_PLATFORM_LIBS}
6263
ssl_lib
6364
crypto_lib

0 commit comments

Comments
 (0)