Fix subversion compilation when apache is present on the host system (#1737)
git-svn-id: svn://svn.openwrt.org/openwrt/packages@7305 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@ -26,7 +26,7 @@ define Package/subversion/Default
|
|||||||
SECTION:=net
|
SECTION:=net
|
||||||
CATEGORY:=Network
|
CATEGORY:=Network
|
||||||
TITLE:=A compelling replacement for CVS
|
TITLE:=A compelling replacement for CVS
|
||||||
DEPENDS:=+zlib +neon +libintl
|
DEPENDS:=+zlib +neon +libintl +apr +apr-util
|
||||||
URL:=http://subversion.tigris.org/
|
URL:=http://subversion.tigris.org/
|
||||||
SUBMENU:=subversion
|
SUBMENU:=subversion
|
||||||
endef
|
endef
|
||||||
@ -61,6 +61,8 @@ define Build/Configure
|
|||||||
--without-berkeley-db \
|
--without-berkeley-db \
|
||||||
--with-ssl \
|
--with-ssl \
|
||||||
--disable-neon-version-check \
|
--disable-neon-version-check \
|
||||||
|
--with-apxs=no \
|
||||||
|
--with-apache=no \
|
||||||
, \
|
, \
|
||||||
svn_lib_neon=yes \
|
svn_lib_neon=yes \
|
||||||
LDFLAGS="-lcrypt -lnsl -lm -lintl -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
|
LDFLAGS="-lcrypt -lnsl -lm -lintl -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
|
||||||
@ -96,3 +98,7 @@ endef
|
|||||||
$(eval $(call BuildPackage,subversion-libs))
|
$(eval $(call BuildPackage,subversion-libs))
|
||||||
$(eval $(call BuildPackage,subversion-client))
|
$(eval $(call BuildPackage,subversion-client))
|
||||||
$(eval $(call BuildPackage,subversion-server))
|
$(eval $(call BuildPackage,subversion-server))
|
||||||
|
|
||||||
|
$(eval $(call RequireCommand,/usr/bin/ruby, \
|
||||||
|
$(PKG_NAME) requires ruby installed on the host-system. \
|
||||||
|
))
|
||||||
|
Reference in New Issue
Block a user