Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request from peter-stadler/nginx-util

Browse source 
[RFC] nginx-util: resolve recursive CONFLICTS
This commit is contained in:
Rosen Penev 2020-02-16 19:37:58 -08:00 committed by GitHub
commit e76a71e667
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions

12
net/nginx-util/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nginx-util PKG_NAME:=nginx-util
PKG_VERSION:=1.3 PKG_VERSION:=1.3
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_MAINTAINER:=Peter Stadler <peter.stadler@student.uibk.ac.at> PKG_MAINTAINER:=Peter Stadler <peter.stadler@student.uibk.ac.at>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -15,27 +15,27 @@ define Package/nginx-util/default
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=Web Servers/Proxies SUBMENU:=Web Servers/Proxies
TITLE:=Builder of LAN listen directives for Nginx TITLE:=Nginx configurator
DEPENDS:=+libstdcpp +libubus +libubox +libpthread DEPENDS:=+libstdcpp +libubus +libubox +libpthread
endef endef
define Package/nginx-util define Package/nginx-util
$(Package/nginx-util/default) $(Package/nginx-util/default)
CONFLICTS:=nginx-ssl-util CONFLICTS:=nginx-ssl-util-nopcre nginx-ssl-util
endef endef
define Package/nginx-ssl-util/default define Package/nginx-ssl-util/default
$(Package/nginx-util/default) $(Package/nginx-util/default)
TITLE+= and manager of its SSL certificates TITLE+= including SSL
DEPENDS+= +libopenssl DEPENDS+= +libopenssl
CONFLICTS:=nginx-util CONFLICTS:=,nginx-util
endef endef
define Package/nginx-ssl-util define Package/nginx-ssl-util
$(Package/nginx-ssl-util/default) $(Package/nginx-ssl-util/default)
TITLE+= (using PCRE) TITLE+= (using PCRE)
DEPENDS+= +libpcre DEPENDS+= +libpcre
CONFLICTS+= nginx-ssl-util-nopcre CONFLICTS+= ,nginx-ssl-util-nopcre
endef endef
define Package/nginx-ssl-util-nopcre define Package/nginx-ssl-util-nopcre