From e0f6166f76a032b1b89cc0aba1987ea385b8c233 Mon Sep 17 00:00:00 2001 From: "Igor Zalatov (from Citadel PC)" <flyrouter@gmail.com> Date: Sun, 8 Aug 2021 15:20:02 +0300 Subject: [PATCH] Enable mbedtls for libevent --- .../unknown_unknown_hi3516ev200_openipc_defconfig | 1 + .../unknown_unknown_hi3516ev300_glibc_defconfig | 1 + .../unknown_unknown_hi3516ev300_openipc_defconfig | 1 + general/package/libevent-openipc/libevent-openipc.mk | 10 ++++++++-- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig index 42e3a967..a031cc3a 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig @@ -62,6 +62,7 @@ BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y # BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y BR2_PACKAGE_LIBEVENT_OPENIPC=y +BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_HI3516EV300=y diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_glibc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_glibc_defconfig index dbb9b895..91f67411 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_glibc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_glibc_defconfig @@ -66,6 +66,7 @@ BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y # BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y BR2_PACKAGE_LIBEVENT_OPENIPC=y +BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_HI3516EV300=y diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig index 8dc97c12..e64f5cfc 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig @@ -63,6 +63,7 @@ BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y # BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y BR2_PACKAGE_LIBEVENT_OPENIPC=y +BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_HI3516EV300=y diff --git a/general/package/libevent-openipc/libevent-openipc.mk b/general/package/libevent-openipc/libevent-openipc.mk index 604afff0..74d88cc0 100644 --- a/general/package/libevent-openipc/libevent-openipc.mk +++ b/general/package/libevent-openipc/libevent-openipc.mk @@ -24,8 +24,7 @@ LIBEVENT_OPENIPC_CONF_OPTS = \ --disable-samples \ --disable-thread-support \ --disable-debug-mode \ - --disable-largefile \ - --disable-openssl + --disable-largefile HOST_LIBEVENT_OPENIPC_CONF_OPTS = \ --disable-libevent-regress \ --disable-samples \ @@ -48,5 +47,12 @@ else LIBEVENT_OPENIPC_CONF_OPTS += --disable-openssl endif +ifeq ($(BR2_PACKAGE_MBEDTLS_OPENIPC),y) +LIBEVENT_OPENIPC_DEPENDENCIES += host-pkgconf mbedtls-openipc +LIBEVENT_OPENIPC_CONF_OPTS += --enable-embedtls +else +LIBEVENT_OPENIPC_CONF_OPTS += --disable-mbedtls +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package))