lede-packages-rs

git clone git://archive.git.mtrnord.blog/MTRNord/lede-packages-rs.git
Log | Files | Refs | README | LICENSE

commit dd31bada67cb30d127fd61f888bb897dd3858bc9
parent 17784c95281e7aca1876b418fe9fcc9583abb3e5
Author: Hannu Nyman <hannu.nyman@iki.fi>
Date:   Fri,  3 Jun 2016 10:02:06 +0300

 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>

Diffstat:
Mnet/aria2/Makefile | 1+
1 file changed, 1 insertion(+), 0 deletions(-)

diff --git a/net/aria2/Makefile b/net/aria2/Makefile @@ -63,6 +63,7 @@ CONFIGURE_ARGS += \ --without-libgmp \ --without-libgcrypt \ --without-libcares \ + --without-libuv \ --without-sqlite3 \ --with-libz