diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2022-08-16 15:22:30 +0300 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2022-08-16 15:24:22 +0300 |
| commit | d960988043243c532ce748df244fba3f60909a38 (patch) | |
| tree | e57abb7260dbbcb317366bdfbb56902702c9ecde /net | |
| parent | ca78c202e6555231d3e35351c76778787c993e44 (diff) | |
Revert "strongswan: add strongswan-mod-socket"
The original PR for this change is #16373, where it's cleary stated it
doesn't work. This should have never been merged. It causes the
following recursive dependency:
tmp/.config-package.in:122354:error: recursive dependency detected!
tmp/.config-package.in:122354: symbol PACKAGE_strongswan-default depends on PACKAGE_strongswan-mod-socket-default
tmp/.config-package.in:123534: symbol PACKAGE_strongswan-mod-socket-default is selected by PACKAGE_strongswan-default
This reverts commit 603f70e96b4dc1b9e442a38cb692de519c1cd54a.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'net')
| -rw-r--r-- | net/strongswan/Makefile | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile index 560b18941..76c08fc3d 100644 --- a/net/strongswan/Makefile +++ b/net/strongswan/Makefile @@ -352,7 +352,7 @@ endef define Package/strongswan-charon $(call Package/strongswan/Default) TITLE+= IKEv1/IKEv2 keying daemon - DEPENDS:= strongswan strongswan-mod-socket + DEPENDS:= strongswan endef define Package/strongswan-charon/description @@ -454,9 +454,6 @@ define BuildPlugin $$(call Package/strongswan/Default) TITLE:= StrongSwan $(2) plugin DEPENDS:= strongswan $(3) -ifneq ($(4),) - PROVIDES:=strongswan-mod-$(4) -endif endef define Package/strongswan-mod-$(1)/install @@ -472,13 +469,6 @@ endif $$(eval $$(call BuildPackage,strongswan-mod-$(1))) endef -define BuildPluginProvides -ifeq ($(4),) - $$(error BuildPluginProvides requires provider suffix) -endif - $(call BuildPlugin,$1,$2,$3,$4) -endef - CONFIGURE_ARGS+= \ --disable-scripts \ --disable-static \ @@ -746,8 +736,8 @@ $(eval $(call BuildPlugin,sha1,SHA1 crypto,)) $(eval $(call BuildPlugin,sha2,SHA2 crypto,)) $(eval $(call BuildPlugin,sha3,SHA3 and SHAKE crypto,)) $(eval $(call BuildPlugin,smp,SMP configuration and control interface,+PACKAGE_strongswan-mod-smp:libxml2)) -$(eval $(call BuildPluginProvides,socket-default,default socket implementation for charon,,socket)) -$(eval $(call BuildPluginProvides,socket-dynamic,dynamic socket implementation for charon,,socket)) +$(eval $(call BuildPlugin,socket-default,default socket implementation for charon,)) +$(eval $(call BuildPlugin,socket-dynamic,dynamic socket implementation for charon,)) $(eval $(call BuildPlugin,sql,SQL database interface,)) $(eval $(call BuildPlugin,sqlite,SQLite database interface,+strongswan-mod-sql +PACKAGE_strongswan-mod-sqlite:libsqlite3)) $(eval $(call BuildPlugin,sshkey,SSH key decoding,)) |