[oe-commits] [openembedded-core] 37/52: openssl: Disable make's -e flag without breaking ${AR}

git at git.openembedded.org git at git.openembedded.org
Thu Mar 16 22:23:02 UTC 2017


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 57e659f279d66d38a4e2e7f9c731ad79d30378f4
Author: Olof Johansson <olof.johansson at axis.com>
AuthorDate: 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.
    
    Signed-off-by: Olof Johansson <olof.johansson at axis.com>
    Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-connectivity/openssl/openssl.inc | 2 --
 1 file changed, 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
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list