domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ustream-ssl: variants conflict with each other

Browse Source 
This adds conflicts between variants of libustream pacakge.
They provide the same file and thus it should not be possible to install
them side by side.

Signed-off-by: Karel Kočí <karel.koci@nic.cz>
(cherry picked from commit 219e17a350)
This commit is contained in:
Karel Kočí
2021-06-21 11:42:25 +02:00
committed by Hauke Mehrtens
parent 6eced97ce4
commit cd5ba0cfbb
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package/libs/ustream-ssl/Makefile
View File

@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=ustream-ssl PKG_NAME:=ustream-ssl
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/ustream-ssl.git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ustream-ssl.git
@@ -37,6 +37,7 @@ define Package/libustream-wolfssl
$(Package/libustream/default) $(Package/libustream/default)
TITLE += (wolfssl) TITLE += (wolfssl)
DEPENDS += +PACKAGE_libustream-wolfssl:libwolfssl DEPENDS += +PACKAGE_libustream-wolfssl:libwolfssl
CONFLICTS := libustream-openssl
VARIANT:=wolfssl VARIANT:=wolfssl
endef endef
@@ -44,6 +45,7 @@ define Package/libustream-mbedtls
$(Package/libustream/default) $(Package/libustream/default)
TITLE += (mbedtls) TITLE += (mbedtls)
DEPENDS += +libmbedtls DEPENDS += +libmbedtls
CONFLICTS := libustream-openssl libustream-wolfssl
VARIANT:=mbedtls VARIANT:=mbedtls
DEFAULT_VARIANT:=1 DEFAULT_VARIANT:=1
endef endef