lede-packages-rs

commit 3427303eee469dace59ff8fd969098bc235fde8c
parent 3d54534d69b87979aa25668aaef5ae37c31c9d96
Author: Peter Wagner <tripolar@gmx.at>
Date:   Sun, 18 Jan 2015 20:05:55 +0100

libtorrent: update to latest git HEAD

Signed-off-by: Peter Wagner <tripolar@gmx.at>

Diffstat:
M
libs/libtorrent/Makefile
 | 
9
+++++----
M
libs/libtorrent/patches/100-fix_cross_compile.patch
 | 
4
++--

2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/libs/libtorrent/Makefile b/libs/libtorrent/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtorrent
-PKG_VERSION:=0.13.4-git
-PKG_RELEASE=$(PKG_SOURCE_VERSION)-1
+PKG_VERSION:=0.13.4-git-0
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/rakshasa/libtorrent.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=51cd5ea8913a5f5062813d9f5b6256c76d41ea11
+PKG_SOURCE_VERSION:=72e908707f01ee01a9b4918436c64348878b63f7
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 PKG_FIXUP:=autoreconf
@@ -48,7 +48,8 @@ CONFIGURE_ARGS+= \
 	--enable-aligned \
 	--disable-debug \
 	--enable-openssl \
-	--disable-instrumentation
+	--disable-instrumentation \
+	--with-zlib=$(STAGING_DIR)/usr
 
 define Build/Configure
 	( cd $(PKG_BUILD_DIR); ./autogen.sh );
diff --git a/libs/libtorrent/patches/100-fix_cross_compile.patch b/libs/libtorrent/patches/100-fix_cross_compile.patch
@@ -21,7 +21,7 @@
        #include <unistd.h>
 --- a/scripts/common.m4
 +++ b/scripts/common.m4
-@@ -223,7 +223,7 @@ dnl   Need to fix this so that it uses t
+@@ -153,7 +153,7 @@ dnl   Need to fix this so that it uses t
  AC_DEFUN([TORRENT_CHECK_EXECINFO], [
    AC_MSG_CHECKING(for execinfo.h)
  
@@ -30,7 +30,7 @@
        #include <execinfo.h>
        int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
        ])],
-@@ -238,7 +238,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
+@@ -168,7 +168,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
  AC_DEFUN([TORRENT_CHECK_ALIGNED], [
    AC_MSG_CHECKING(the byte alignment)