From faa38162665a7f8719853a86050706822d716a14 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Fri, 6 Jul 2018 12:05:53 -0700 Subject: 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) (From OE-Core rev: 000da57cc858f5432153be849faba3862e4e9ed5) Signed-off-by: Andre McCurdy Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssl/openssl_1.1.0h.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-connectivity') 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 () { #| engines/afalg/e_afalg.c:110:20: error: '__NR_eventfd' undeclared (first use in this function) #| return syscall(__NR_eventfd, n); #| ^~~~~~~~~~~~ -EXTRA_OECONF_aarch64 += "no-afalgeng" +EXTRA_OECONF_append_aarch64 = " no-afalgeng" #| ./libcrypto.so: undefined reference to `getcontext' #| ./libcrypto.so: undefined reference to `setcontext' #| ./libcrypto.so: undefined reference to `makecontext' -EXTRA_OECONF_libc-musl += "-DOPENSSL_NO_ASYNC" +EXTRA_OECONF_append_libc-musl = " -DOPENSSL_NO_ASYNC" do_install () { oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install -- cgit v1.2.3-54-g00ecf