Skip to contentSkip to conversation

libwebsockets: fix multilib install

PATCH New Andreas Müller 1 participant 2 messages Feb 1, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 libwebsockets: fix multilib install

| ERROR: libwebsockets-3.0.0-r0 do_package: QA Issue: libwebsockets: Files/directories were installed but not shipped in any package:
|   /usr/lib/libwebsockets.so
|   /usr/lib/libwebsockets.a
|   /usr/lib/libwebsockets.so.13
|   /usr/lib/cmake
|   /usr/lib/pkgconfig
|   /usr/lib/cmake/libwebsockets
|   /usr/lib/cmake/libwebsockets/LibwebsocketsTargets-release.cmake
|   /usr/lib/cmake/libwebsockets/LibwebsocketsConfig.cmake
|   /usr/lib/cmake/libwebsockets/LibwebsocketsConfigVersion.cmake
|   /usr/lib/cmake/libwebsockets/LibwebsocketsTargets.cmake
|   /usr/lib/pkgconfig/libwebsockets_static.pc
|   /usr/lib/pkgconfig/libwebsockets.pc
---
 .../recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb | 4 ++++
 1 file changed, 4 insertions(+)
meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb +4 -0
index f38414862..70e7c78a1 100644
@@ -21,6 +21,10 @@ PACKAGECONFIG[server] = "-DLWS_WITHOUT_SERVER=OFF,-DLWS_WITHOUT_SERVER=ON,"
 PACKAGECONFIG[ssl] = "-DLWS_WITH_SSL=ON,-DLWS_WITH_SSL=OFF,openssl"
 PACKAGECONFIG[testapps] = "-DLWS_WITHOUT_TESTAPPS=OFF,-DLWS_WITHOUT_TESTAPPS=ON,"
 
+EXTRA_OECMAKE += " \
+    -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
+"
+
 PACKAGES =+ "${PN}-testapps"
 
 FILES_${PN}-testapps += "${datadir}/libwebsockets-test-server/*"
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 libwebsockets: upgrade 3.0.0 -> 3.1.0

---
 .../{libwebsockets_3.0.0.bb => libwebsockets_3.1.0.bb}          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-connectivity/libwebsockets/{libwebsockets_3.0.0.bb => libwebsockets_3.1.0.bb} (95%)
meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.1.0.bb renamed from meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb +1 -1
similarity index 95%
rename from meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb
rename to meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.1.0.bb
index 70e7c78a1..50620d99e 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4ce87f3facb6f911c142c8bef9bfb380"
 DEPENDS = "zlib"
 
 S = "${WORKDIR}/git"
-SRCREV = "eaa935a80adb38b5cc4d09ce06ec987b87dcddfa"
+SRCREV = "89eedcaa94e1c8a97ea3af10642fd224bcea068f"
 SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;"
 
 inherit cmake pkgconfig
Signature · 1 line
2.20.1