summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-connectivity/rtorrent/rtorrent/0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch45
-rw-r--r--meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.2.bb (renamed from meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.1.bb)7
2 files changed, 3 insertions, 49 deletions
diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent/0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch b/meta-oe/recipes-connectivity/rtorrent/rtorrent/0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch
deleted file mode 100644
index bd075c0b21..0000000000
--- a/meta-oe/recipes-connectivity/rtorrent/rtorrent/0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From da3687c276078e8ad1df3c972bd1d5deaffb3dc5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 24 Oct 2025 08:45:02 -0700
4Subject: [PATCH] scripts/common.m4: Insert spaces in shell lists
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9$1=$(echo "$result" | tr -d '\n')
10
11removes all newlines without inserting spaces
12That usually isn’t what we want for shell lists.
13It should typically be space-separated output.
14
15Fixes a bug seen with yocto where compiler is not a single word
16but a string e.g.
17
18ccache 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
19
20It changes it to
21
22ccacheaarch64-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
23
24When doing c++17 checks on compiler, resulting in failure
25
26Upstream-Status: Submitted [https://github.com/rakshasa/rtorrent/pull/1620]
27Signed-off-by: Khem Raj <raj.khem@gmail.com>
28---
29 scripts/common.m4 | 3 ++-
30 1 file changed, 2 insertions(+), 1 deletion(-)
31
32diff --git a/scripts/common.m4 b/scripts/common.m4
33index 7129204..d8ee019 100644
34--- a/scripts/common.m4
35+++ b/scripts/common.m4
36@@ -30,7 +30,8 @@ AC_DEFUN([TORRENT_REMOVE_UNWANTED],
37 $1="$2"
38 else
39 result=`echo "${values_to_check}" | $GREP -Fvx -- "${unwanted_values}" | $GREP -v '^$'`
40- $1=$(echo "$result" | tr -d '\n')
41+ # join with spaces, squeeze repeats, and trim trailing space
42+ $1=$(printf '%s\n' "$result" | tr '\n' ' ' | sed 's/ */ /g; s/ *$//')
43 fi
44 ])
45
diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.1.bb b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.2.bb
index 0030b7593d..e077efa22a 100644
--- a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.1.bb
+++ b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.2.bb
@@ -5,10 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
5 5
6DEPENDS = "autoconf-archive libsigc++-2.0 curl cppunit libtool libtorrent ncurses" 6DEPENDS = "autoconf-archive libsigc++-2.0 curl cppunit libtool libtorrent ncurses"
7 7
8SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https;tag=v${PV} \ 8SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https;tag=v${PV}"
9 file://0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch \ 9
10 " 10SRCREV = "8550facf43fd1e36b416bcdb3b025e7e09578364"
11SRCREV = "b38f80e59795dc6728b2c31ac3eab564651ce46d"
12 11
13inherit autotools pkgconfig 12inherit autotools pkgconfig
14 13