From 6c4942b5c771876ad0e62e56923f59cc71776157 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 23 Jul 2018 19:38:52 -0700 Subject: 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. Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton --- meta/recipes-connectivity/openssl/openssl_1.0.2o.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/recipes-connectivity') 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 () { perl ./Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} shared --prefix=$useprefix --openssldir=${libdir}/ssl --libdir=$libdirleaf $target } -do_compile_prepend_class-target () { - sed -i 's/\((OPENSSL=\)".*"/\1"openssl"/' Makefile +do_compile () { oe_runmake depend - cc_sanitized=`echo "${CC} ${CFLAG}" | sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' -e 's|${DEBUG_PREFIX_MAP}||g'` - oe_runmake CC_INFO="$cc_sanitized" + oe_runmake } -do_compile () { +do_compile_class-target () { + sed -i 's/\((OPENSSL=\)".*"/\1"openssl"/' Makefile oe_runmake depend - oe_runmake + cc_sanitized=`echo "${CC} ${CFLAG}" | sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' -e 's|${DEBUG_PREFIX_MAP}||g'` + oe_runmake CC_INFO="$cc_sanitized" } do_compile_ptest () { -- cgit 1.2.3-korg