From 00f1463df7e690862403208082f71fb4741baf02 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 --- package/libs/mbedtls/Makefile | 7 ------- .../libs/mbedtls/patches/101-remove-test.patch | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 7 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 b07f0477e45..2ae3fdbe2ae 100644 --- a/package/libs/mbedtls/Makefile +++ b/package/libs/mbedtls/Makefile @@ -130,13 +130,6 @@ CMAKE_OPTIONS += \ -DENABLE_TESTING:Bool=OFF \ -DENABLE_PROGRAMS:Bool=ON -define Build/Configure - $(call Build/Configure/Default) - - sed -i '/fuzz/d' $(PKG_BUILD_DIR)/programs/CMakeLists.txt - sed -i '/test/d' $(PKG_BUILD_DIR)/programs/CMakeLists.txt -endef - define Build/Prepare $(call Build/Prepare/Default) 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 00000000000..e43f8757d71 --- /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