From a2e0eca6e3b646ff552ab3bc19006e4105307160 Mon Sep 17 00:00:00 2001 From: Khem Raj 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 --- scripts/common.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/common.m4 b/scripts/common.m4 index 7129204f..d8ee0199 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 ])