summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-07-06 12:05:53 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-09 22:48:39 +0100
commitc4aa9678a82860839c4b174f4c42799ae1ea048c (patch)
tree99d87cfbc2df49318a941ba4edad3a3b1f11cce8 /meta
parentf9ad66da9f3825d6f534b5111f9bc131af7d0483 (diff)
downloadpoky-c4aa9678a82860839c4b174f4c42799ae1ea048c.tar.gz
openssl_1.1: avoid using += with an over-ride
Using += with an over-ride can be a source of confusion so try to avoid the construct in core recipes. The current usage is incorrect and prevents the aarch64 and musl specific config options from being active together. (From OE-Core rev: 2a30a9ecab6465892698f7fc9d14a430d8a26f0c) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.1.0h.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
index 29f83a31a2..64b8a997d0 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
@@ -126,12 +126,12 @@ do_configure () {
126#| engines/afalg/e_afalg.c:110:20: error: '__NR_eventfd' undeclared (first use in this function) 126#| engines/afalg/e_afalg.c:110:20: error: '__NR_eventfd' undeclared (first use in this function)
127#| return syscall(__NR_eventfd, n); 127#| return syscall(__NR_eventfd, n);
128#| ^~~~~~~~~~~~ 128#| ^~~~~~~~~~~~
129EXTRA_OECONF_aarch64 += "no-afalgeng" 129EXTRA_OECONF_append_aarch64 = " no-afalgeng"
130 130
131#| ./libcrypto.so: undefined reference to `getcontext' 131#| ./libcrypto.so: undefined reference to `getcontext'
132#| ./libcrypto.so: undefined reference to `setcontext' 132#| ./libcrypto.so: undefined reference to `setcontext'
133#| ./libcrypto.so: undefined reference to `makecontext' 133#| ./libcrypto.so: undefined reference to `makecontext'
134EXTRA_OECONF_libc-musl += "-DOPENSSL_NO_ASYNC" 134EXTRA_OECONF_append_libc-musl = " -DOPENSSL_NO_ASYNC"
135 135
136do_install () { 136do_install () {
137 oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install 137 oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install