summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2024-05-24 20:28:00 +0200
committerKhem Raj <raj.khem@gmail.com>2024-05-24 14:31:08 -0700
commit17a1bb00de5b80db1a3779c7a735cecbeea5a9bb (patch)
tree1837df474b391acc60a3b018d3edae369ced5086
parentc6cf5fe79ba013e575ecdc833cf9c3cf0730523c (diff)
downloadmeta-openembedded-17a1bb00de5b80db1a3779c7a735cecbeea5a9bb.tar.gz
libwebsockets: remove STAGING_LIBDIR with /
* 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 <martin.jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb4
1 files 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() {
42 sed -i -e 's|${STAGING_LIBDIR}/libuv.so|uv|g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake 42 sed -i -e 's|${STAGING_LIBDIR}/libuv.so|uv|g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake
43 sed -i -e 's|${STAGING_INCDIR}||g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake \ 43 sed -i -e 's|${STAGING_INCDIR}||g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake \
44 ${D}${libdir}/cmake/libwebsockets/libwebsockets-config.cmake 44 ${D}${libdir}/cmake/libwebsockets/libwebsockets-config.cmake
45 sed -i -e 's|${STAGING_LIBDIR}||g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake \ 45 sed -i -e 's|${STAGING_LIBDIR}/||g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake \
46 ${D}${libdir}/cmake/libwebsockets/libwebsockets-config.cmake 46 ${D}${libdir}/cmake/libwebsockets/libwebsockets-config.cmake
47} 47}
48 48
49PACKAGES =+ "${PN}-testapps ${PN}-evlib-event ${PN}-evlib-uv ${PN}-evlib-ev ${PN}-evlib-sd" 49PACKAGES =+ "${PN}-testapps ${PN}-evlib-event ${PN}-evlib-uv ${PN}-evlib-ev ${PN}-evlib-sd"