[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5170/8267] openssl: Disable make's -e flag without breaking ${AR}



commit 8f1d763adc0f283a0c3f2fb7247c14b0777cfbd9
Author: Olof Johansson <olof johansson axis com>
Date:   Sat Mar 11 06:28:52 2017 +0100

    openssl: Disable make's -e flag without breaking ${AR}
    
    The OpenSSL recipe tried to workaround the -e make flag (overriding
    variables from the environment). And when the -e flag was dropped as
    the global default, it was specifically added for OpenSSL. This is
    unnecessary, as only the value of ${AR} seems to be affected, and that
    can be handled correctly by OpenSSL's build system if we just let it.
    
    (From OE-Core rev: 537a404cfbb811fcb526cdb5f2e059257de6ef13)
    
    Signed-off-by: Olof Johansson <olof johansson axis com>
    Signed-off-by: Peter Kjellerstedt <peter kjellerstedt axis com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-connectivity/openssl/openssl.inc |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 9afa5bd..28421da 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -17,7 +17,6 @@ S = "${WORKDIR}/openssl-${PV}"
 
 PACKAGECONFIG[perl] = ",,,"
 
-AR_append = " r"
 TERMIO_libc-musl = "-DTERMIOS"
 TERMIO ?= "-DTERMIO"
 # Avoid binaries being marked as requiring an executable stack since it 
@@ -28,7 +27,6 @@ CFLAG = "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_END
 export DIRS = "crypto ssl apps"
 export EX_LIBS = "-lgcc -ldl"
 export AS = "${CC} -c"
-EXTRA_OEMAKE = "-e MAKEFLAGS="
 
 inherit pkgconfig siteinfo multilib_header ptest relative_symlinks
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]