diff --git a/package/swupdate/Config.in b/package/swupdate/Config.in index e87f695861..f601e45fcd 100644 --- a/package/swupdate/Config.in +++ b/package/swupdate/Config.in @@ -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 diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index fe967d7fd7..402aa0a91f 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -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