* [Buildroot] [PATCH 1/2] package/libuwsc: lua needs dynamic library
@ 2020-04-19 23:26 Fabrice Fontaine
2020-04-19 23:26 ` [Buildroot] [PATCH 2/2] package/libuwsc: manage BUILD_STATIC_LIBS Fabrice Fontaine
2020-04-20 5:53 ` [Buildroot] [PATCH 1/2] package/libuwsc: lua needs dynamic library Thomas Petazzoni
0 siblings, 2 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2020-04-19 23:26 UTC (permalink / raw)
To: buildroot
lua is built as a module so it needs dynamic library
Fixes:
- http://autobuild.buildroot.org/results/fe511be44e8546b58c97dc956c07f5a45e0fc3c9
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/libuwsc/libuwsc.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/libuwsc/libuwsc.mk b/package/libuwsc/libuwsc.mk
index 83d05a96ec..08ea72c1f3 100644
--- a/package/libuwsc/libuwsc.mk
+++ b/package/libuwsc/libuwsc.mk
@@ -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
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] package/libuwsc: manage BUILD_STATIC_LIBS
2020-04-19 23:26 [Buildroot] [PATCH 1/2] package/libuwsc: lua needs dynamic library Fabrice Fontaine
@ 2020-04-19 23:26 ` Fabrice Fontaine
2020-04-20 5:53 ` Thomas Petazzoni
2020-04-20 5:53 ` [Buildroot] [PATCH 1/2] package/libuwsc: lua needs dynamic library Thomas Petazzoni
1 sibling, 1 reply; 4+ messages in thread
From: Fabrice Fontaine @ 2020-04-19 23:26 UTC (permalink / raw)
To: buildroot
Use BUILD_STATIC_LIBS added in version 3.3.5 with
https://github.com/zhaojh329/libuwsc/commit/1759dfd7d9f65775dc0a27e85b8c8c482efbfd00
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/libuwsc/libuwsc.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/libuwsc/libuwsc.mk b/package/libuwsc/libuwsc.mk
index 08ea72c1f3..cad351529d 100644
--- a/package/libuwsc/libuwsc.mk
+++ b/package/libuwsc/libuwsc.mk
@@ -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))
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/2] package/libuwsc: lua needs dynamic library
2020-04-19 23:26 [Buildroot] [PATCH 1/2] package/libuwsc: lua needs dynamic library Fabrice Fontaine
2020-04-19 23:26 ` [Buildroot] [PATCH 2/2] package/libuwsc: manage BUILD_STATIC_LIBS Fabrice Fontaine
@ 2020-04-20 5:53 ` Thomas Petazzoni
1 sibling, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2020-04-20 5:53 UTC (permalink / raw)
To: buildroot
On Mon, 20 Apr 2020 01:26:27 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> lua is built as a module so it needs dynamic library
>
> Fixes:
> - http://autobuild.buildroot.org/results/fe511be44e8546b58c97dc956c07f5a45e0fc3c9
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/libuwsc/libuwsc.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-04-20 5:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-19 23:26 [Buildroot] [PATCH 1/2] package/libuwsc: lua needs dynamic library Fabrice Fontaine
2020-04-19 23:26 ` [Buildroot] [PATCH 2/2] package/libuwsc: manage BUILD_STATIC_LIBS Fabrice Fontaine
2020-04-20 5:53 ` Thomas Petazzoni
2020-04-20 5:53 ` [Buildroot] [PATCH 1/2] package/libuwsc: lua needs dynamic library Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox