mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-14 22:35:25 +01:00
rtorrent: Upgrade to 0.16.1
Add a patch for m4 macros Disable execinfo on musl as it does not support it Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
87ef752688
commit
f5e7ef7032
|
|
@ -0,0 +1,45 @@
|
||||||
|
From da3687c276078e8ad1df3c972bd1d5deaffb3dc5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Fri, 24 Oct 2025 08:45:02 -0700
|
||||||
|
Subject: [PATCH] scripts/common.m4: Insert spaces in shell lists
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
$1=$(echo "$result" | tr -d '\n')
|
||||||
|
|
||||||
|
removes all newlines without inserting spaces
|
||||||
|
That usually isn’t what we want for shell lists.
|
||||||
|
It should typically be space-separated output.
|
||||||
|
|
||||||
|
Fixes a bug seen with yocto where compiler is not a single word
|
||||||
|
but a string e.g.
|
||||||
|
|
||||||
|
ccache aarch64-yoe-linux-musl-clang++ -mcpu=cortex-a72+crc+nocrypto --dyld-prefix=/usr -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/libtorrent/0.16.1/recipe-sysroot
|
||||||
|
|
||||||
|
It changes it to
|
||||||
|
|
||||||
|
ccacheaarch64-yoe-linux-musl-clang++-mcpu=cortex-a72+crc+nocrypto--dyld-prefix=/usr-fstack-protector-strong-O2-D_FORTIFY_SOURCE=2-Wformat-Wformat-security-Werror=format-security--sysroot=/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/libtorrent/0.16.1/recipe-sysroot
|
||||||
|
|
||||||
|
When doing c++17 checks on compiler, resulting in failure
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://github.com/rakshasa/rtorrent/pull/1620]
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
scripts/common.m4 | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/scripts/common.m4 b/scripts/common.m4
|
||||||
|
index 7129204..d8ee019 100644
|
||||||
|
--- a/scripts/common.m4
|
||||||
|
+++ b/scripts/common.m4
|
||||||
|
@@ -30,7 +30,8 @@ AC_DEFUN([TORRENT_REMOVE_UNWANTED],
|
||||||
|
$1="$2"
|
||||||
|
else
|
||||||
|
result=`echo "${values_to_check}" | $GREP -Fvx -- "${unwanted_values}" | $GREP -v '^$'`
|
||||||
|
- $1=$(echo "$result" | tr -d '\n')
|
||||||
|
+ # join with spaces, squeeze repeats, and trim trailing space
|
||||||
|
+ $1=$(printf '%s\n' "$result" | tr '\n' ' ' | sed 's/ */ /g; s/ *$//')
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
|
|
@ -5,16 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
|
||||||
|
|
||||||
DEPENDS = "autoconf-archive libsigc++-2.0 curl cppunit libtool libtorrent ncurses"
|
DEPENDS = "autoconf-archive libsigc++-2.0 curl cppunit libtool libtorrent ncurses"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https"
|
SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https;tag=v${PV} \
|
||||||
SRCREV = "a88cab6d2e764e22cac232ef8d5af039d41b8280"
|
file://0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch \
|
||||||
|
"
|
||||||
|
SRCREV = "b38f80e59795dc6728b2c31ac3eab564651ce46d"
|
||||||
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
|
|
||||||
|
|
||||||
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
|
|
||||||
|
|
||||||
inherit autotools pkgconfig
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
EXTRA_AUTORECONF += "--exclude=aclocal"
|
EXTRA_OECONF:append:libc-musl = " --disable-execinfo"
|
||||||
|
|
||||||
CXXFLAGS += "-std=gnu++14"
|
|
||||||
Loading…
Reference in New Issue
Block a user