From 515cbe68e7edfe93b46c61f05c92e663bf3893e2 Mon Sep 17 00:00:00 2001 From: viktorxda <35473052+viktorxda@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:29:20 +0100 Subject: [PATCH] [no ci] Package: update nabto makefile (#1701) --- .../package/nabto/0000-set-shared-libraries.patch | 13 +++++++++++++ general/package/nabto/nabto.mk | 3 +-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/general/package/nabto/0000-set-shared-libraries.patch b/general/package/nabto/0000-set-shared-libraries.patch index b31f0578..a3590658 100644 --- a/general/package/nabto/0000-set-shared-libraries.patch +++ b/general/package/nabto/0000-set-shared-libraries.patch @@ -55,6 +55,19 @@ index cbc6b8a..0eb63d7 100644 if (args->homeDir != NULL) { // perfect just using the homeDir make_directory(args->homeDir); +diff --git a/platform_integration_example/CMakeLists.txt b/platform_integration_example/CMakeLists.txt +index c30f4ab..b01ec4c 100644 +--- a/platform_integration_example/CMakeLists.txt ++++ b/platform_integration_example/CMakeLists.txt +@@ -41,7 +41,7 @@ else() + nm_mbedtls_srv + nm_mbedtls_random + nm_mbedtls_spake2 +- 3rdparty_mbedtls ++ mbedtls + ) + endif() + diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 60b89b3..b67bb86 100644 --- a/src/core/CMakeLists.txt diff --git a/general/package/nabto/nabto.mk b/general/package/nabto/nabto.mk index 24b3b890..2e3ccabd 100644 --- a/general/package/nabto/nabto.mk +++ b/general/package/nabto/nabto.mk @@ -19,8 +19,7 @@ endef NABTO_CONF_OPTS += \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=OFF \ - -DDEVICE_BUILD_EXAMPLES=OFF + -DBUILD_SHARED_LIBS=OFF define NABTO_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin