From b0824ad9315e3a61f61ff7e040c0be54ad506b60 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 18 Feb 2022 16:01:53 +0100 Subject: coin: Preserve quoted arguments when calling cmake / configure Previously we used sh $* for passing parameters of various calls like cmake / configure. This did not properly preserve quoted arguments, leading to potential issues. For example when configuring qtbase with cmake -DQT_QMAKE_DEVICE_OPTIONS="DISTRO_OPTS=hard-float boot2qt" the 'boot2qt' option would be passed as a separate argument to cmake, leading to the QT_QMAKE_DEVICE_OPTIONS cache var containing only 'DISTRO_OPTS=hard-float'. Use "$@" to preserve the quotes. Inspired by https://wiki.bash-hackers.org/scripting/posparams#all_positional_parameters Amends e9b8837c31041326a0e4d66eed6775d385913915 Pick-to: 6.2 6.3 Change-Id: Ib67d4bc138c65f7430457cb2a2baa55bff72e549 Reviewed-by: Alexey Edelev --- coin/instructions/prepare_building_env.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml index b05592f5e3..d8243e7a12 100644 --- a/coin/instructions/prepare_building_env.yaml +++ b/coin/instructions/prepare_building_env.yaml @@ -265,7 +265,7 @@ instructions: instructions: # Need to unset QMAKESPEC, so that the pre-installed boot2qt mkspec is not picked up. - type: WriteFile - fileContents: "#!/bin/bash\nunset LD_LIBRARY_PATH\n. {{.Env.QT_YOCTO_ENVSETUP}}\nexport PATH={{.Env.QT_CMAKE_DIR}}:$PATH;\nunset QMAKESPEC\n$*" + fileContents: "#!/bin/bash\nunset LD_LIBRARY_PATH\n. {{.Env.QT_YOCTO_ENVSETUP}}\nexport PATH={{.Env.QT_CMAKE_DIR}}:$PATH;\nunset QMAKESPEC\n\"$@\"" filename: "{{.Env.HOME}}/prefix.sh" fileMode: 493 maxTimeInSeconds: 20 -- cgit v1.2.3