From f5f9a9e1cca3b7030be1741816df6eda36ce9a32 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 30 Mar 2023 16:57:59 +0200 Subject: [PATCH] scripts/build: properly honor strip build flag Package building honor's the strip flag so we can prevent executables from being stripped. But copying files to INSTALL ignored that flag which meant the flag had practically no effect. Fix this by using the same logic as we do in the meson strip handling in line 170 and in config/functions. Also add the missing quotes in scripts/build to align it with config/functions Signed-off-by: Matthias Reichl --- scripts/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build b/scripts/build index 6cf9068feb..311ba6c5c4 100755 --- a/scripts/build +++ b/scripts/build @@ -167,7 +167,7 @@ TARGET_MESON_OPTS="--prefix=/usr \ --libexecdir=/usr/lib \ --localstatedir=/var \ --buildtype=${MESON_BUILD_TYPE}" -if [ ${BUILD_WITH_DEBUG} != yes ] && flag_enabled "strip" "yes"; then +if [ "${BUILD_WITH_DEBUG}" != "yes" ] && flag_enabled "strip" "yes"; then TARGET_MESON_OPTS+=" -Dstrip=true" fi @@ -524,7 +524,7 @@ if [ "${TARGET}" = "target" -o "${TARGET}" = "init" ]; then python_fix_abi "${INSTALL}" - if [ ! "${BUILD_WITH_DEBUG}" = "yes" ]; then + if [ "${BUILD_WITH_DEBUG}" != "yes" ] && flag_enabled "strip" "yes"; then ${STRIP} $(find ${INSTALL} \ -type f -name "*.so*" \ ! -name "ld-*.so" \