From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by mail.openembedded.org (Postfix) with ESMTP id C2CF879EAA for ; Sat, 3 Nov 2018 16:44:50 +0000 (UTC) X-Originating-IP: 50.37.87.235 Received: from xps13.localdomain (50-37-87-235.mscw.id.frontiernet.net [50.37.87.235]) (Authenticated sender: robert.joslyn@redrectangle.org) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 1CD82FF806; Sat, 3 Nov 2018 16:44:49 +0000 (UTC) From: Robert Joslyn To: openembedded-core@lists.openembedded.org Date: Sat, 3 Nov 2018 09:44:06 -0700 Message-Id: <20181103164427.16125-5-robert.joslyn@redrectangle.org> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20181103164427.16125-1-robert.joslyn@redrectangle.org> References: <20181103164427.16125-1-robert.joslyn@redrectangle.org> Subject: [rocko][PATCH 04/25] openssl_1.1: avoid using += with an over-ride X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Nov 2018 16:44:51 -0000 From: Andre McCurdy 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(-) diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb index e843304980..ea55189f70 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb @@ -120,12 +120,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 -- 2.18.1