 aria2: explicitely disable libuv support
If libuv is present within the build environment, aria2 will fail to build
with the following error:
LibuvEventPoll.cc: In member function 'virtual void aria2::LibuvEventPoll::poll(const timeval&)':
LibuvEventPoll.cc:144:59: error: invalid conversion from 'void (*)(uv_timer_t*, int) {aka void (*)(uv_timer_s*, int)}' to 'uv_timer_cb {aka void (*)(uv_timer_s*)}' [-fpermissive]
uv_timer_start(timer, timer_callback, timeout, timeout);
^
In file included from LibuvEventPoll.h:43:0,
from LibuvEventPoll.cc:44:
.../staging_dir/target-arm_xscale_musl-1.1.14_eabi/usr/include/uv.h:770:44: note: initializing argument 2 of 'int uv_timer_start(uv_timer_t*, uv_timer_cb, uint64_t, uint64_t)'
UV_EXTERN int uv_timer_start(uv_timer_t* handle,
^
Makefile:2271: recipe for target 'LibuvEventPoll.lo' failed
make[6]: *** [LibuvEventPoll.lo] Error 1
Explicitely disable the libuv support in `configure` to avoid picking up this
unwanted dependency.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Patch modified to resolve conflict caused by #2804
This closes #2776
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
8 years ago |
|
- #
- # Copyright (C) 2012-2016 OpenWrt.org
- #
- # This is free software, licensed under the GNU General Public License v2.
- # See /LICENSE for more information.
- #
- include $(TOPDIR)/rules.mk
-
- PKG_NAME:=aria2
- PKG_VERSION:=1.27.1
- PKG_RELEASE:=1
-
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
- PKG_SOURCE_URL:=https://github.com/aria2/aria2/releases/download/release-$(PKG_VERSION)/
- PKG_MD5SUM:=eb17bec0cd3ecd56003ff89457b53951
- PKG_INSTALL:=1
-
- PKG_MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>, Hsing-Wang Liao <kuoruan@gmail.com>
- PKG_LICENSE:=GPLv2
- PKG_LICENSE_FILES:=COPYING
-
- PKG_CONFIG_DEPENDS := \
- ARIA2_NOSSL \
- ARIA2_OPENSSL \
- ARIA2_GNUTLS \
- ARIA2_BITTORRENT \
- ARIA2_METALINK \
- ARIA2_SFTP \
- ARIA2_EXPAT \
- ARIA2_LIBXML2
-
- include $(INCLUDE_DIR)/package.mk
-
- define Package/aria2/config
- source "$(SOURCE)/Config.in"
- endef
-
- define Package/aria2
- SECTION:=net
- CATEGORY:=Network
- SUBMENU:=File Transfer
- TITLE:=lightweight download utility
- URL:=https://aria2.github.io/
- DEPENDS:=+zlib +ARIA2_SFTP:libssh2 +ARIA2_LIBXML2:libxml2 +ARIA2_EXPAT:libexpat +libstdcpp +ARIA2_OPENSSL:libopenssl +ARIA2_GNUTLS:libgnutls
- endef
-
- define Package/aria2/description
- aria2 is a lightweight multi-protocol & multi-source command-line download
- utility
- endef
-
- CONFIGURE_ARGS += \
- --disable-nls \
- $(if $(CONFIG_ARIA2_NOSSL),--disable,--enable)-ssl \
- $(if $(CONFIG_ARIA2_OPENSSL),--with,--without)-openssl \
- $(if $(CONFIG_ARIA2_GNUTLS),--with,--without)-gnutls \
- $(if $(CONFIG_ARIA2_BITTORRENT),--enable,--disable)-bittorrent \
- $(if $(CONFIG_ARIA2_METALINK),--enable,--disable)-metalink \
- $(if $(CONFIG_ARIA2_SFTP),--with,--without)-libssh2 \
- $(if $(CONFIG_ARIA2_LIBXML2),--with,--without)-libxml2 \
- $(if $(CONFIG_ARIA2_EXPAT),--with,--without)-libexpat \
- --without-libnettle \
- --without-libgmp \
- --without-libgcrypt \
- --without-libcares \
- --without-libuv \
- --without-sqlite3 \
- --with-libz
-
- define Package/aria2/install
- $(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aria2c $(1)/usr/bin
-
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_BIN) ./files/aria2.init $(1)/etc/init.d/aria2
-
- $(INSTALL_DIR) $(1)/etc/config
- $(INSTALL_CONF) ./files/aria2.conf $(1)/etc/config/aria2
- endef
-
- $(eval $(call BuildPackage,aria2))
|
