From 9a12afc5e74442290e7b91bc7aff6ace4e9ab4b4 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Wed, 18 Jan 2023 22:06:36 +0100 Subject: [PATCH] mbedtls: move source modification to patch Patch the mbedtls source instead of modifying the compile-targets in the prepare buildstep within OpenWrt. Signed-off-by: David Bauer (cherry picked from commit 00f1463df7e690862403208082f71fb4741baf02) --- package/libs/mbedtls/Makefile | 3 --- .../libs/mbedtls/patches/101-remove-test.patch | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 package/libs/mbedtls/patches/101-remove-test.patch diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile index ee1a58c7b2..cfaa71c817 100644 --- a/package/libs/mbedtls/Makefile +++ b/package/libs/mbedtls/Makefile @@ -111,9 +111,6 @@ define Build/Configure END { exit(rc) }' $(PKG_BUILD_DIR)/include/mbedtls/config.h \ >$(PKG_BUILD_DIR)/include/mbedtls/config.h.new && \ mv $(PKG_BUILD_DIR)/include/mbedtls/config.h.new $(PKG_BUILD_DIR)/include/mbedtls/config.h - - sed -i '/fuzz/d' $(PKG_BUILD_DIR)/programs/CMakeLists.txt - sed -i '/test/d' $(PKG_BUILD_DIR)/programs/CMakeLists.txt endef define Build/InstallDev diff --git a/package/libs/mbedtls/patches/101-remove-test.patch b/package/libs/mbedtls/patches/101-remove-test.patch new file mode 100644 index 0000000000..e43f8757d7 --- /dev/null +++ b/package/libs/mbedtls/patches/101-remove-test.patch @@ -0,0 +1,15 @@ +--- a/programs/CMakeLists.txt ++++ b/programs/CMakeLists.txt +@@ -1,12 +1,8 @@ + add_subdirectory(aes) +-if (NOT WIN32) +- add_subdirectory(fuzz) +-endif() + add_subdirectory(hash) + add_subdirectory(pkey) + add_subdirectory(psa) + add_subdirectory(random) + add_subdirectory(ssl) +-add_subdirectory(test) + add_subdirectory(util) + add_subdirectory(x509) -- 2.30.2