Merge pull request #11024 from micmac1/subversion

apr-util: clean up reverse depends (and fix subversion dep)
This commit is contained in:
Rosen Penev
2020-01-15 17:35:07 -08:00
committed by GitHub
6 changed files with 110 additions and 8 deletions
+3 -4
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=apache
PKG_VERSION:=2.4.41
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE_NAME:=httpd
PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2
@@ -40,8 +40,7 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_apache-mod-session-crypto \
CONFIG_PACKAGE_apache-mod-suexec \
CONFIG_PACKAGE_apache-mod-webdav \
CONFIG_PACKAGE_apache-suexec \
CONFIG_PACKAGE_libaprutil-dbm-gdbm
CONFIG_PACKAGE_apache-suexec
PKG_FIXUP:=autoreconf
@@ -68,7 +67,7 @@ endef
define Package/apache
$(call Package/apache/Default)
USERID:=apache=377:apache=377
DEPENDS:=+PACKAGE_libaprutil-dbm-gdbm:libgdbm +libapr +libaprutil +libpcre
DEPENDS:=+libapr +libaprutil +libpcre
endef
define Package/apache/description
+2 -2
View File
@@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=subversion
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_VERSION:=1.13.0
PKG_SOURCE_URL:=@APACHE/subversion
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -31,7 +31,7 @@ define Package/subversion/Default
CATEGORY:=Network
SUBMENU:=Version Control Systems
TITLE:=A compelling replacement for CVS
DEPENDS:=+PACKAGE_unixodbc:unixodbc +libaprutil +libmagic $(ICONV_DEPENDS) $(INTL_DEPENDS)
DEPENDS:=+PACKAGE_unixodbc:unixodbc +libaprutil +libmagic +libsqlite3 $(ICONV_DEPENDS) $(INTL_DEPENDS)
URL:=https://subversion.apache.org/
endef