From 8f57d3c6721e87a2e33025ac736b0e24f9d6f9bd Mon Sep 17 00:00:00 2001 From: James Zern Date: Wed, 31 Aug 2022 13:26:47 -0700 Subject: [PATCH 1/2] imei.sh: fix aom cmake flags remove the quotes from $CMAKE_FLAGS in the cmake invocation. CMAKE_FLAGS is a string and quoting it will pass it as a single parameter causing the flags to be ignored. an alternative would be to convert this variable to a bash array and use "${CMAKE_FLAGS[@]}". fixes #69 --- imei.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imei.sh b/imei.sh index 301cdba..b736498 100755 --- a/imei.sh +++ b/imei.sh @@ -8,7 +8,7 @@ # Author : Sascha Greuel # # Date : 2022-08-31 09:01 # # License : ISC # -# Version : 6.6.3 # +# Version : 6.6.4 # # # # Usage : bash ./imei.sh # ############################################################## @@ -535,7 +535,7 @@ install_aom() { tar -xf "aom-$AOM_VER.tar.gz" && mkdir "$WORK_DIR/build_aom" && cd "$WORK_DIR/build_aom" && - cmake "../aom-$AOM_VER/" "$CMAKE_FLAGS" && + cmake "../aom-$AOM_VER/" $CMAKE_FLAGS && make if [ -n "$CHECKINSTALL" ]; then From baba2ea4994498019354307cd457868438632fe2 Mon Sep 17 00:00:00 2001 From: James Zern Date: Wed, 31 Aug 2022 13:30:26 -0700 Subject: [PATCH 2/2] use an array this covers the code factor checks --- imei.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/imei.sh b/imei.sh index b736498..661f0e1 100755 --- a/imei.sh +++ b/imei.sh @@ -526,16 +526,16 @@ install_aom() { fi # see https://github.com/SoftCreatR/imei/issues/9 - CMAKE_FLAGS="-DBUILD_SHARED_LIBS=1 -DENABLE_DOCS=0 -DENABLE_TESTS=0 -DENABLE_CCACHE=1" + CMAKE_FLAGS=(-DBUILD_SHARED_LIBS=1 -DENABLE_DOCS=0 -DENABLE_TESTS=0 -DENABLE_CCACHE=1) if [[ "${OS_DISTRO,,}" == *"raspbian"* ]]; then - CMAKE_FLAGS+=' -DCMAKE_C_FLAGS="-mfloat-abi=hard -march=armv7-a -marm -mfpu=neon"' + CMAKE_FLAGS+=(-DCMAKE_C_FLAGS="-mfloat-abi=hard -march=armv7-a -marm -mfpu=neon") fi tar -xf "aom-$AOM_VER.tar.gz" && mkdir "$WORK_DIR/build_aom" && cd "$WORK_DIR/build_aom" && - cmake "../aom-$AOM_VER/" $CMAKE_FLAGS && + cmake "../aom-$AOM_VER/" "${CMAKE_FLAGS[@]}" && make if [ -n "$CHECKINSTALL" ]; then