aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Bauer <mail@david-bauer.net>2023-01-18 22:06:36 +0100
committerDavid Bauer <mail@david-bauer.net>2023-01-18 23:39:11 +0100
commit9a12afc5e74442290e7b91bc7aff6ace4e9ab4b4 (patch)
tree57a14024e19c79cbcc7997fb3f664e92fc22cd5a
parentc1a26341ab979a8029aa2ffed73fa04b95071119 (diff)
downloadupstream-9a12afc5e74442290e7b91bc7aff6ace4e9ab4b4.tar.gz
upstream-9a12afc5e74442290e7b91bc7aff6ace4e9ab4b4.tar.bz2
upstream-9a12afc5e74442290e7b91bc7aff6ace4e9ab4b4.zip
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 <mail@david-bauer.net> (cherry picked from commit 00f1463df7e690862403208082f71fb4741baf02)
-rw-r--r--package/libs/mbedtls/Makefile3
-rw-r--r--package/libs/mbedtls/patches/101-remove-test.patch15
2 files changed, 15 insertions, 3 deletions
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)