]> code.ossystems Code Review - openembedded-core.git/commitdiff
openssl_1.0: squash whitespace in CC_INFO
authorAndre McCurdy <armccurdy@gmail.com>
Sat, 28 Jul 2018 20:39:23 +0000 (13:39 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 29 Aug 2018 14:22:25 +0000 (15:22 +0100)
Squash whitespace in CC_INFO to avoid recipe whitespace changes to
CFLAG affecting the final openssl binaries (the value of CC_INFO gets
embedded in libcrypto, via buildinf.h).

(From OE-Core rev: 2227c51896d4399daac9d85f40d7510b7c8ae03f)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
meta/recipes-connectivity/openssl/openssl_1.0.2o.bb

index bbce14fe6be2a06a29caa35d6d77759ca1858267..f5d327475bbd446123f4da4b8cbe5c66acb7b6b9 100644 (file)
@@ -211,7 +211,7 @@ do_compile () {
 do_compile_class-target () {
        sed -i 's/\((OPENSSL=\)".*"/\1"openssl"/' Makefile
        oe_runmake depend
-       cc_sanitized=`echo "${CC} ${CFLAG}" | sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' -e 's|${DEBUG_PREFIX_MAP}||g'`
+       cc_sanitized=$(echo "${CC} ${CFLAG}" | sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' -e 's|${DEBUG_PREFIX_MAP}||g' -e 's/[ \t]\+/ /g')
        oe_runmake CC_INFO="$cc_sanitized"
 }