mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 05:51:45 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/civetweb: drop BR2_PACKAGE_CIVETWEB_WITH_LUA

Browse Source 
Drop BR2_PACKAGE_CIVETWEB_WITH_LUA and enable Lua support depending on
BR2_PACKAGE_LUA and BR2_PACKAGE_LUAJIT

It should be noted that civetweb will still use its embedded version of
sqlite

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Peter: add !BR2_STATIC_LIBS, pass LUA_SHARED_LIB_FLAG, explicitly link with
	-ldl, rework order]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2020-11-04 08:43:11 +01:00
committed by Peter Korsgaard
parent 0e71f51119
commit 329f71ed30
3 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Config.in.legacy
View File

@@ -146,6 +146,15 @@ endif
comment "Legacy options removed in 2022.02" comment "Legacy options removed in 2022.02"
config BR2_PACKAGE_CIVETWEB_WITH_LUA
bool "civetweb lua support option removed"
select BR2_LEGACY
help
Lua support does not depend on a version of Lua bundled
within the Civetweb sources anymore. Lua support is
automatically enabled if an Lua interpreter (lua or luajit)
is enabled in Buildroot.
config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER
bool "sunxi-mali-mainline-driver package was renamed" bool "sunxi-mali-mainline-driver package was renamed"
select BR2_LEGACY select BR2_LEGACY

12
package/civetweb/Config.in
View File

@@ -21,18 +21,6 @@ config BR2_PACKAGE_CIVETWEB_LIB
Enable the civetweb library for embedding in another Enable the civetweb library for embedding in another
application. application.
config BR2_PACKAGE_CIVETWEB_WITH_LUA
bool "enable Lua support"
# required by the bundled Sqlite3 and Lua code
depends on !BR2_STATIC_LIBS
help
Enable Lua support in Civetweb. Note that this will use a
version of Lua and Sqlite bundled within the Civetweb
sources, and not the packages from Buildroot.
comment "lua support needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS
endif endif
comment "civetweb needs a toolchain w/ threads" comment "civetweb needs a toolchain w/ threads"

18
package/civetweb/civetweb.mk
View File

@@ -26,9 +26,21 @@ ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),)
CIVETWEB_COPT += -DNO_ATOMICS=1 CIVETWEB_COPT += -DNO_ATOMICS=1
endif endif
ifeq ($(BR2_PACKAGE_CIVETWEB_WITH_LUA),y) ifeq ($(BR2_PACKAGE_LUAJIT),y)
CIVETWEB_CONF_OPTS += WITH_LUA=1 CIVETWEB_CONF_OPTS += WITH_LUAJIT_SHARED=1
CIVETWEB_LIBS += -ldl CIVETWEB_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs luajit` -ldl
CIVETWEB_DEPENDENCIES += host-pkgconf luajit
else ifeq ($(BR2_PACKAGE_LUA):$(BR2_STATIC_LIBS),y:)
CIVETWEB_CONF_OPTS += WITH_LUA=1 WITH_LUA_SHARED=1 LUA_SHARED_LIB_FLAG=''
CIVETWEB_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs lua`
CIVETWEB_DEPENDENCIES += host-pkgconf lua
ifeq ($(BR2_PACKAGE_LUA_5_1),y)
CIVETWEB_CONF_OPTS += WITH_LUA_VERSION=501
else ifeq ($(BR2_PACKAGE_LUA_5_3),y)
CIVETWEB_CONF_OPTS += WITH_LUA_VERSION=503
else ifeq ($(BR2_PACKAGE_LUA_5_4),y)
CIVETWEB_CONF_OPTS += WITH_LUA_VERSION=504
endif
endif endif
ifeq ($(BR2_PACKAGE_OPENSSL),y) ifeq ($(BR2_PACKAGE_OPENSSL),y)