mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
libtorrent: Update to tip of trunk
Drop cross compile patch as we do not need it anymore since we now use --enable-aligned License-Update: Correctly mark the license as GPL-2.0+ Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
68fe58173d
commit
6d0eaf9a27
|
|
@ -1,28 +0,0 @@
|
|||
Using AC_RUN_IFELSE prevent people from configuring package for
|
||||
cross-compiling. Don't run code while configuring package.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
|
||||
|
||||
Index: git/scripts/common.m4
|
||||
===================================================================
|
||||
--- git.orig/scripts/common.m4
|
||||
+++ git/scripts/common.m4
|
||||
@@ -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)
|
||||
|
||||
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([
|
||||
+ AC_LINK_IFELSE([AC_LANG_SOURCE([
|
||||
#include <execinfo.h>
|
||||
int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
|
||||
])],
|
||||
@@ -168,7 +168,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
|
||||
AC_DEFUN([TORRENT_CHECK_ALIGNED], [
|
||||
AC_MSG_CHECKING(the byte alignment)
|
||||
|
||||
- AC_RUN_IFELSE([AC_LANG_SOURCE([
|
||||
+ AC_LINK_IFELSE([AC_LANG_SOURCE([
|
||||
#include <inttypes.h>
|
||||
int main() {
|
||||
char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 };
|
||||
|
|
@ -1,36 +1,32 @@
|
|||
DESCRIPTION = "libTorrent is a BitTorrent library written in C++ for *nix, \
|
||||
with a focus on high performance and good code."
|
||||
HOMEPAGE = "http://libtorrent.rakshasa.no/"
|
||||
LICENSE = "GPL-2.0-only"
|
||||
LICENSE = "GPL-2.0-or-later"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
|
||||
|
||||
DEPENDS = "zlib libsigc++-2.0 openssl cppunit"
|
||||
|
||||
SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https \
|
||||
file://don-t-run-code-while-configuring-package.patch \
|
||||
"
|
||||
SRCREV = "756f70010779927dc0691e1e722ed433d5d295e1"
|
||||
SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https"
|
||||
SRCREV = "e60f222241319aaae482789517ad00ae9344bd13"
|
||||
|
||||
CVE_CHECK_IGNORE += "\
|
||||
CVE-2009-1760 \
|
||||
"
|
||||
|
||||
PV = "0.13.8"
|
||||
PV = "0.13.8+git${SRCPV}"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
PACKAGECONFIG ??= "instrumentation"
|
||||
|
||||
PACKAGECONFIG ??= "instrumentation aligned"
|
||||
|
||||
PACKAGECONFIG:remove:mipsarch = "instrumentation"
|
||||
PACKAGECONFIG:remove:powerpc = "instrumentation"
|
||||
PACKAGECONFIG:remove:riscv32 = "instrumentation"
|
||||
|
||||
PACKAGECONFIG[instrumentation] = "--enable-instrumentation,--disable-instrumentation,"
|
||||
PACKAGECONFIG[aligned] = "--enable-aligned,--disable-aligned,"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
EXTRA_OECONF = "--with-zlib=${STAGING_EXECPREFIXDIR}"
|
||||
|
||||
do_configure:prepend() {
|
||||
(cd ${S}; ./autogen.sh; cd -)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user