NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/swupdate: needs dynamic libary

Browse Source 
dynamic library is needed since bump to version 2021.04 in commit
2c6b0359c3 and
f802cfa427

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2021-07-31 22:03:27 +02:00 committed by Thomas Petazzoni
parent 867e7a040c
commit 047d7cb173
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/swupdate/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_SWUPDATE
bool "swupdate"
depends on !BR2_STATIC_LIBS
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork()
# swupdate requires a parser and uses libconfig as default
@ -70,6 +71,6 @@ config BR2_PACKAGE_SWUPDATE_INSTALL_WEBSITE
installed to /var/www/swupdate.
endif
comment "swupdate needs a toolchain w/ threads"
comment "swupdate needs a toolchain w/ dynamic library, threads"
depends on BR2_USE_MMU
depends on !BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS

9
package/swupdate/swupdate.mk
View File

@ -93,7 +93,7 @@ else
SWUPDATE_MAKE_ENV += HAVE_LIBWEBSOCKETS=n
endif
ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER):$(BR2_STATIC_LIBS),y:)
ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y)
SWUPDATE_DEPENDENCIES += luainterpreter host-pkgconf
# defines the base name for the pkg-config file ("lua" or "luajit")
define SWUPDATE_SET_LUA_VERSION
@ -185,19 +185,12 @@ SWUPDATE_BUILD_CONFIG = $(@D)/.config
SWUPDATE_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG))
SWUPDATE_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
ifeq ($(BR2_STATIC_LIBS),y)
define SWUPDATE_PREFER_STATIC
$(call KCONFIG_ENABLE_OPT,CONFIG_STATIC)
endef
endif
SWUPDATE_MAKE_OPTS = \
CROSS_COMPILE="$(TARGET_CROSS)" \
CONFIG_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
CONFIG_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)"
define SWUPDATE_KCONFIG_FIXUP_CMDS
$(SWUPDATE_PREFER_STATIC)
$(SWUPDATE_SET_LUA_VERSION)
endef