diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2018-07-28 13:39:23 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-29 15:23:50 +0100 |
commit | be5382caff679c2c9f515363ca3404d14d8c52b6 (patch) | |
tree | 1fd9368ea68cac79a3758b268c3e4a3863f72f8c /meta | |
parent | 6b3f4c8a661f67387a3716905c767375ff7ce0bd (diff) | |
download | poky-be5382caff679c2c9f515363ca3404d14d8c52b6.tar.gz |
openssl_1.0: squash whitespace in CC_INFO
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)
(From OE-Core rev: 0bda7fda8ce11b9b8c4c69aee1afbda30c3eadd5)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.0.2o.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb index bbce14fe6b..f5d327475b 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb | |||
@@ -211,7 +211,7 @@ do_compile () { | |||
211 | do_compile_class-target () { | 211 | do_compile_class-target () { |
212 | sed -i 's/\((OPENSSL=\)".*"/\1"openssl"/' Makefile | 212 | sed -i 's/\((OPENSSL=\)".*"/\1"openssl"/' Makefile |
213 | oe_runmake depend | 213 | oe_runmake depend |
214 | cc_sanitized=`echo "${CC} ${CFLAG}" | sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' -e 's|${DEBUG_PREFIX_MAP}||g'` | 214 | cc_sanitized=$(echo "${CC} ${CFLAG}" | sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' -e 's|${DEBUG_PREFIX_MAP}||g' -e 's/[ \t]\+/ /g') |
215 | oe_runmake CC_INFO="$cc_sanitized" | 215 | oe_runmake CC_INFO="$cc_sanitized" |
216 | } | 216 | } |
217 | 217 | ||