summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-07-23 19:38:52 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-26 13:16:41 +0100
commit46d81915f7c7ee6e2ccb74af5e539ecca735776d (patch)
tree21b2a888d7bb6b1225a17f16667777693c1cfab0 /meta/recipes-connectivity
parent1d7a9db53f619c3c5acf9084eca3ee1c179c660d (diff)
downloadpoky-46d81915f7c7ee6e2ccb74af5e539ecca735776d.tar.gz
openssl_1.0: avoid running make twice for target do_compile()
Currently target builds call make twice as part of do_compile(). It appears to be an accidental side effect of needing to only pass CC_INFO on the make command line for target builds, since CC_INFO is only referenced by the reproducible build patches. (From OE-Core rev: 6c4942b5c771876ad0e62e56923f59cc71776157) 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>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2o.bb12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
index 58627b0b3e..9e5e7ec0f9 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
@@ -210,16 +210,16 @@ do_configure () {
210 perl ./Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} shared --prefix=$useprefix --openssldir=${libdir}/ssl --libdir=$libdirleaf $target 210 perl ./Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} shared --prefix=$useprefix --openssldir=${libdir}/ssl --libdir=$libdirleaf $target
211} 211}
212 212
213do_compile_prepend_class-target () { 213do_compile () {
214 sed -i 's/\((OPENSSL=\)".*"/\1"openssl"/' Makefile
215 oe_runmake depend 214 oe_runmake depend
216 cc_sanitized=`echo "${CC} ${CFLAG}" | sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' -e 's|${DEBUG_PREFIX_MAP}||g'` 215 oe_runmake
217 oe_runmake CC_INFO="$cc_sanitized"
218} 216}
219 217
220do_compile () { 218do_compile_class-target () {
219 sed -i 's/\((OPENSSL=\)".*"/\1"openssl"/' Makefile
221 oe_runmake depend 220 oe_runmake depend
222 oe_runmake 221 cc_sanitized=`echo "${CC} ${CFLAG}" | sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' -e 's|${DEBUG_PREFIX_MAP}||g'`
222 oe_runmake CC_INFO="$cc_sanitized"
223} 223}
224 224
225do_compile_ptest () { 225do_compile_ptest () {