aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlof Johansson <olof.johansson@axis.com>2017-03-11 06:28:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-17 15:37:05 +0000
commit537a404cfbb811fcb526cdb5f2e059257de6ef13 (patch)
tree1784286d3350bda2ea25ebf1c43fcf5d63e8678c
parent7b3692f57628b33840f6dbcddbe05ae56c24b98e (diff)
downloadopenembedded-core-contrib-537a404cfbb811fcb526cdb5f2e059257de6ef13.zip
openembedded-core-contrib-537a404cfbb811fcb526cdb5f2e059257de6ef13.tar.gz
openembedded-core-contrib-537a404cfbb811fcb526cdb5f2e059257de6ef13.tar.bz2
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@axis.com> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc2
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