Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Andre McCurdy <armccurdy@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 5/5] openssl_1.0: squash whitespace in CC_INFO
Date: Fri, 27 Jul 2018 16:28:01 -0700	[thread overview]
Message-ID: <1532734081-24485-5-git-send-email-armccurdy@gmail.com> (raw)
In-Reply-To: <1532734081-24485-1-git-send-email-armccurdy@gmail.com>

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).

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/recipes-connectivity/openssl/openssl_1.0.2o.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
index 527be72..f33ca97 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 () {
 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"
 }
 
-- 
1.9.1



  parent reply	other threads:[~2018-07-27 23:28 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-27 23:27 [PATCH 1/5] openssl_1.0: drop obsolete ca.patch Andre McCurdy
2018-07-27 23:27 ` [PATCH 2/5] openssl_1.0: drop obsolete exporting of AS, EX_LIBS and DIRS Andre McCurdy
2018-07-27 23:27 ` [PATCH 3/5] openssl_1.0: drop unmaintained darwin support Andre McCurdy
2018-07-27 23:28 ` [PATCH 4/5] openssl_1.0: add PACKAGECONFIG option to control manpages Andre McCurdy
2018-07-28 11:57   ` Burton, Ross
2018-07-28 20:36     ` Andre McCurdy
2018-07-27 23:28 ` Andre McCurdy [this message]
2018-07-28 17:33 ` [PATCH 1/5] openssl_1.0: drop obsolete ca.patch Alexander Kanavin
2018-07-28 21:01   ` Andre McCurdy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1532734081-24485-5-git-send-email-armccurdy@gmail.com \
    --to=armccurdy@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox