diff --git a/.gitignore b/.gitignore index 9e6f569..a2d73e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .vscode/ -.vscode/* \ No newline at end of file +.vscode/* +recipes-wolfssl/wolfssl/commercial/files/wolfssl* \ No newline at end of file diff --git a/recipes-support/curl/curl_7.82.0.bbappend b/recipes-support/curl/curl_7.82.0.bbappend index 80fe5e5..61f8ee5 100644 --- a/recipes-support/curl/curl_7.82.0.bbappend +++ b/recipes-support/curl/curl_7.82.0.bbappend @@ -6,3 +6,8 @@ CPPFLAGS += "-I${STAGING_DIR_HOST}${prefix}/include/wolfssl" # Uncomment the line below if you're targeting FIPS compliance. NTLM uses MD5, # which isn't a FIPS-approved algorithm. # EXTRA_OECONF += "--disable-ntlm" + +# Add the directory where the patch is located to the search path +FILESEXTRAPATHS_prepend := "${THISDIR}/patches:" + +SRC_URI += "file://wolfssl-m4-options-fix.patch" \ No newline at end of file diff --git a/recipes-support/curl/kirkstone/curl_7.82.0.bbappend b/recipes-support/curl/kirkstone/curl_7.82.0.bbappend index 586bb1e..954b793 100644 --- a/recipes-support/curl/kirkstone/curl_7.82.0.bbappend +++ b/recipes-support/curl/kirkstone/curl_7.82.0.bbappend @@ -8,3 +8,8 @@ CPPFLAGS:class-target += "-I${STAGING_DIR_HOST}${prefix}/include/wolfssl" # Uncomment the line below if you're targeting FIPS compliance. NTLM uses MD5, # which isn't a FIPS-approved algorithm. # EXTRA_OECONF:class-target += "--disable-ntlm" + +# Add the directory where the patch is located to the search path +FILESEXTRAPATHS:prepend := "${THISDIR}/../patches:" + +SRC_URI += "file://wolfssl-m4-options-fix.patch" \ No newline at end of file diff --git a/recipes-support/curl/patches/wolfssl-m4-options-fix.patch b/recipes-support/curl/patches/wolfssl-m4-options-fix.patch new file mode 100644 index 0000000..75586f5 --- /dev/null +++ b/recipes-support/curl/patches/wolfssl-m4-options-fix.patch @@ -0,0 +1,27 @@ +From 6657602f504e49d27b5aa667a5ed04076ac2c4f6 Mon Sep 17 00:00:00 2001 +From: Rosen Penev +Date: Tue, 19 Jul 2022 19:22:20 -0700 +Subject: [PATCH] curl-wolfssl.m4: add options header when building test code + +Needed for certain configurations of wolfSSL. Otherwise, missing header +error may occur. + +Tested with OpenWrt. + +Closes #9187 +--- + m4/curl-wolfssl.m4 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/m4/curl-wolfssl.m4 b/m4/curl-wolfssl.m4 +index 1f732e348ac2..9d6f561d803a 100644 +--- a/m4/curl-wolfssl.m4 ++++ b/m4/curl-wolfssl.m4 +@@ -95,6 +95,7 @@ if test "x$OPT_WOLFSSL" != xno; then + They are set up properly later if it is detected. */ + #undef SIZEOF_LONG + #undef SIZEOF_LONG_LONG ++#include + #include + ]],[[ + return wolfSSL_Init();