diff mbox series

[1/2] package/libiec61850: add mbedtls optional dependency

Message ID 20231230181320.982102-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/2] package/libiec61850: add mbedtls optional dependency | expand

Commit Message

Fabrice Fontaine Dec. 30, 2023, 6:13 p.m. UTC 
mbedtls is an optional dependency since bump to version 1.5.0 in
commit a42e0e4600be785fa750c6b481c41a76d041df03 and
https://github.com/mz-automation/libiec61850/commit/19f2cbf0e7066753476ff8c38c07a6f0df73a622

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/libiec61850/libiec61850.mk | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Thomas Petazzoni Jan. 1, 2024, 8:37 p.m. UTC | #1 
On Sat, 30 Dec 2023 19:13:19 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> mbedtls is an optional dependency since bump to version 1.5.0 in
> commit a42e0e4600be785fa750c6b481c41a76d041df03 and
> https://github.com/mz-automation/libiec61850/commit/19f2cbf0e7066753476ff8c38c07a6f0df73a622
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/libiec61850/libiec61850.mk | 7 +++++++
>  1 file changed, 7 insertions(+)

Both applied to master, thanks!

Thomas
Peter Korsgaard Jan. 10, 2024, 8:02 p.m. UTC | #2 
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > mbedtls is an optional dependency since bump to version 1.5.0 in
 > commit a42e0e4600be785fa750c6b481c41a76d041df03 and
 > https://github.com/mz-automation/libiec61850/commit/19f2cbf0e7066753476ff8c38c07a6f0df73a622

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2023.02.x and 2023.11.x, thanks.
diff mbox series

Patch

diff --git a/package/libiec61850/libiec61850.mk b/package/libiec61850/libiec61850.mk
index 4b61e40c6d..a3cfb74b03 100644
--- a/package/libiec61850/libiec61850.mk
+++ b/package/libiec61850/libiec61850.mk
@@ -15,4 +15,11 @@  LIBIEC61850_CONF_OPTS = -DBUILD_PYTHON_BINDINGS=OFF
 # https://github.com/mz-automation/libiec61850/issues/442
 LIBIEC61850_IGNORE_CVES += CVE-2023-27772
 
+ifeq ($(BR2_PACKAGE_MBEDTLS),y)
+LIBIEC61850_DEPENDENCIES += mbedtls
+LIBIEC61850_CONF_OPTS += -DCONFIG_USE_EXTERNAL_MBEDTLS_DYNLIB=ON
+else
+LIBIEC61850_CONF_OPTS += -DCONFIG_USE_EXTERNAL_MBEDTLS_DYNLIB=OFF
+endif
+
 $(eval $(cmake-package))