mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-14 14:25:53 +01:00
libtorrent: upgrade 0.16.1 -> 0.16.2
Remove 0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch as it was merged in upstream. Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
bac13f19ec
commit
2c0c0a9ec8
|
|
@ -1,45 +0,0 @@
|
||||||
From 9df2559d55c454c7128b65103456c2f88b3bf2f5 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/libtorrent/pull/583]
|
|
||||||
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 74b99e6a..44a5fe65 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
|
|
||||||
])
|
|
||||||
|
|
||||||
|
|
@ -6,9 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
|
||||||
|
|
||||||
DEPENDS = "zlib curl libsigc++-2.0 openssl cppunit"
|
DEPENDS = "zlib curl libsigc++-2.0 openssl cppunit"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https;tag=v${PV} \
|
SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https;tag=v${PV}"
|
||||||
file://0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch"
|
SRCREV = "bd9c66338d9d33b92db9939abb3e0c5d0dace511"
|
||||||
SRCREV = "919d23923ad0a483fa24441093eda1c12cea4c0b"
|
|
||||||
|
|
||||||
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
|
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user