From patchwork Sun Jun 16 19:23:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 45217 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FA19C2BA15 for ; Sun, 16 Jun 2024 19:24:19 +0000 (UTC) Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net [185.136.64.228]) by mx.groups.io with SMTP id smtpd.web11.40410.1718565853616799793 for ; Sun, 16 Jun 2024 12:24:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm2 header.b=AwzdIXSM; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.228, mailfrom: fm-256628-20240616192410337fe474279ff5e756-zs_ejd@rts-flowmailer.siemens.com) Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20240616192410337fe474279ff5e756 for ; Sun, 16 Jun 2024 21:24:10 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=XaZkoWWzDVEbRePt5DmhFPTIgy8fVbEP9H4ADFuyJPA=; b=AwzdIXSMz0Y4c26l4dE/19aTbCeE1Q/0N/WHARFcd52Sp8k5ClKXgzfVFbGkXGRUp6n7e9 ynuiZPBPIyo8ua7ZEwoeiXYsuUMnt4zOmUbifw7tBvvgXfzuklcMZPq4Ngs54fPT0nL8mew3 IsVpj1GvmKgNMhhBhr/BUbPV7qRBI=; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa , Khem Raj , Peter Marko Subject: [meta-oe][scarthgap][PATCH 4/6] libwebsockets: remove STAGING_LIBDIR with / Date: Sun, 16 Jun 2024 21:23:08 +0200 Message-Id: <20240616192310.856262-5-peter.marko@siemens.com> In-Reply-To: <20240616192310.856262-1-peter.marko@siemens.com> References: <20240616192310.856262-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 16 Jun 2024 19:24:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110927 From: Martin Jansa From: Martin Jansa * after buildpath warnings fix from: https://git.openembedded.org/meta-openembedded/commit/?id=eeef1fddd9052bed4b1a91565260518eb042fed2 the LibwebsocketsTargets.cmake ends with: INTERFACE_LINK_LIBRARIES "ssl;crypto;ssl;crypto;/libcap.so;-lpthread" instead of: INTERFACE_LINK_LIBRARIES "ssl;crypto;ssl;crypto;/OE/build/.../libwebsockets/4.3.3/lib32-recipe-sysroot/usr/lib/libcap.so;-lpthread" which causes e.g. mosquitto to fail in do_compile with: ninja: error: '/libcap.so', needed by 'src/mosquitto', missing and no known rule to make it * this happens only when libwebsocket is built with libcap enabled (by libcap in DEPENDS) Signed-off-by: Martin Jansa Signed-off-by: Khem Raj Signed-off-by: Peter Marko --- .../recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb index 8f8b70421c..3170d37f5b 100644 --- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb +++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb @@ -42,8 +42,8 @@ do_install:append() { sed -i -e 's|${STAGING_LIBDIR}/libuv.so|uv|g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake sed -i -e 's|${STAGING_INCDIR}||g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake \ ${D}${libdir}/cmake/libwebsockets/libwebsockets-config.cmake - sed -i -e 's|${STAGING_LIBDIR}||g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake \ - ${D}${libdir}/cmake/libwebsockets/libwebsockets-config.cmake + sed -i -e 's|${STAGING_LIBDIR}/||g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake \ + ${D}${libdir}/cmake/libwebsockets/libwebsockets-config.cmake } PACKAGES =+ "${PN}-testapps ${PN}-evlib-event ${PN}-evlib-uv ${PN}-evlib-ev ${PN}-evlib-sd"