Skip to contentSkip to conversation

package/libuwsc: lua needs dynamic library

PATCH New Fabrice Fontaine 2 participants 4 messages Apr 19, 2020 – Apr 20, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/libuwsc: lua needs dynamic library

lua is built as a module so it needs dynamic library

Fixes:
- http://autobuild.buildroot.org/results/fe511be44e8546b58c97dc956c07f5a45e0fc3c9

---
 package/libuwsc/libuwsc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libuwsc/libuwsc.mk +1 -1
index 83d05a96ec..08ea72c1f3 100644
@@ -36,7 +36,7 @@ else
 LIBUWSC_CONF_OPTS += -DUWSC_SSL_SUPPORT=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_LUA),y)
+ifeq ($(BR2_PACKAGE_LUA):$(BR2_STATIC_LIBS),y:)
 LIBUWSC_DEPENDENCIES += lua
 LIBUWSC_CONF_OPTS += -DUWSC_LUA_SUPPORT=ON
 else
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/2 package/libuwsc: manage BUILD_STATIC_LIBS

Use BUILD_STATIC_LIBS added in version 3.3.5 with
https://github.com/zhaojh329/libuwsc/commit/1759dfd7d9f65775dc0a27e85b8c8c482efbfd00

---
 package/libuwsc/libuwsc.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/libuwsc/libuwsc.mk +7 -0
index 08ea72c1f3..cad351529d 100644
@@ -43,4 +43,11 @@ else
 LIBUWSC_CONF_OPTS += -DUWSC_LUA_SUPPORT=OFF
 endif
 
+# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable
+ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+LIBUWSC_CONF_OPTS += -DBUILD_STATIC_LIBS=ON
+else ifeq ($(BR2_SHARED_LIBS),y)
+LIBUWSC_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF
+endif
+
 $(eval $(cmake-package))
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/2 package/libuwsc: manage BUILD_STATIC_LIBS

Quoted 7 lines · On Mon, 20 Apr 2020 01:26:28 +0200 Fabrice Fontaine…

Use BUILD_STATIC_LIBS added in version 3.3.5 with
https://github.com/zhaojh329/libuwsc/commit/1759dfd7d9f65775dc0a27e85b8c8c482efbfd00

---
 package/libuwsc/libuwsc.mk | 7 +++++++
 1 file changed, 7 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/2 package/libuwsc: lua needs dynamic library

In reply to Fabrice Fontaine
Quoted 9 lines · On Mon, 20 Apr 2020 01:26:27 +0200 Fabrice Fontaine…

lua is built as a module so it needs dynamic library

Fixes:
- http://autobuild.buildroot.org/results/fe511be44e8546b58c97dc956c07f5a45e0fc3c9

---
 package/libuwsc/libuwsc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com