From 5ffc45126d886f8d4767f9784f561e14a41bb493 Mon Sep 17 00:00:00 2001 From: Matthew Hagan Date: Wed, 15 Dec 2021 15:42:09 +0000 Subject: [PATCH] openvswitch: fix libunbound dependency check The ifeq check for CONFIG_OPENVSWITCH_WITH_LIBUNBOUND does not evaluate correctly within the menuconfig, resulting in libunbound not being selected, resulting in a failing libunbound.so.8 dependency. Instead add this condition:dependency in the manner defined in the OpenWrt developer guide. Signed-off-by: Matthew Hagan --- net/openvswitch/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index f9c212da1..abd202eda 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -153,10 +153,9 @@ $(eval $(call OvsKmodPackageTemplate,openvswitch-lisp-intree)) # ovs_libopenvswitch_title:=Open vSwitch (libopenvswitch.so) ovs_libopenvswitch_hidden:=1 -ovs_libopenvswitch_depends:= +libatomic +libopenssl +!(arc||arceb):libunwind -ifeq ($(CONFIG_OPENVSWITCH_WITH_LIBUNBOUND),y) -ovs_libopenvswitch_depends+=+libunbound -endif +ovs_libopenvswitch_depends:= \ + +libatomic +libopenssl +OPENVSWITCH_WITH_LIBUNBOUND:libunbound \ + +!(arc||arceb):libunwind ovs_libopenvswitch_files:=usr/lib/libopenvswitch*.so* $(eval $(call OvsPackageTemplate,libopenvswitch))