diff options
author | Olof Johansson <olof.johansson@axis.com> | 2017-03-11 06:28:52 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-17 16:53:05 +0000 |
commit | 8f1d763adc0f283a0c3f2fb7247c14b0777cfbd9 (patch) | |
tree | f07c924dd9c8b85e59981682032287873bbbd815 | |
parent | 12cc4f550a001de18d09d9b2da8a9c90e9bb2f24 (diff) | |
download | poky-8f1d763adc0f283a0c3f2fb7247c14b0777cfbd9.tar.gz |
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>
-rw-r--r-- | 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 9afa5bd567..28421dab33 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc | |||
@@ -17,7 +17,6 @@ S = "${WORKDIR}/openssl-${PV}" | |||
17 | 17 | ||
18 | PACKAGECONFIG[perl] = ",,," | 18 | PACKAGECONFIG[perl] = ",,," |
19 | 19 | ||
20 | AR_append = " r" | ||
21 | TERMIO_libc-musl = "-DTERMIOS" | 20 | TERMIO_libc-musl = "-DTERMIOS" |
22 | TERMIO ?= "-DTERMIO" | 21 | TERMIO ?= "-DTERMIO" |
23 | # Avoid binaries being marked as requiring an executable stack since it | 22 | # 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 | |||
28 | export DIRS = "crypto ssl apps" | 27 | export DIRS = "crypto ssl apps" |
29 | export EX_LIBS = "-lgcc -ldl" | 28 | export EX_LIBS = "-lgcc -ldl" |
30 | export AS = "${CC} -c" | 29 | export AS = "${CC} -c" |
31 | EXTRA_OEMAKE = "-e MAKEFLAGS=" | ||
32 | 30 | ||
33 | inherit pkgconfig siteinfo multilib_header ptest relative_symlinks | 31 | inherit pkgconfig siteinfo multilib_header ptest relative_symlinks |
34 | 32 | ||