jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

civetweb: rename lua option to match naming convention

Browse Source 
Suboptions of package foo should be prefixed with BR2_PACKAGE_FOO, not just
BR2_FOO.

Also add Config.in.legacy handling for it.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard 2015-04-27 22:29:05 +02:00
parent fc882cf2ad
commit efd49e3366
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Config.in.legacy
View File

@ -107,6 +107,15 @@ endif
############################################################################### ###############################################################################
comment "Legacy options removed in 2015.05" comment "Legacy options removed in 2015.05"
config BR2_CIVETWEB_WITH_LUA
bool "civetweb lua option renamed"
select BR2_LEGACY
select BR2_PACKAGE_CIVETWEB_WITH_LUA
help
civetweb's lua option has been renamed to
BR2_PACKAGE_CIVETWEB_WITH_LUA to be aligned with how other
packages name options.
config BR2_PACKAGE_TIFF_TIFF2PDF config BR2_PACKAGE_TIFF_TIFF2PDF
bool "tiff utility-specific option removed" bool "tiff utility-specific option removed"
select BR2_LEGACY select BR2_LEGACY

2
package/civetweb/Config.in
View File

@ -9,7 +9,7 @@ config BR2_PACKAGE_CIVETWEB
if BR2_PACKAGE_CIVETWEB if BR2_PACKAGE_CIVETWEB
config BR2_CIVETWEB_WITH_LUA config BR2_PACKAGE_CIVETWEB_WITH_LUA
bool "enable Lua support" bool "enable Lua support"
# required by the bundled Sqlite3 and Lua code # required by the bundled Sqlite3 and Lua code
depends on !BR2_STATIC_LIBS depends on !BR2_STATIC_LIBS

2
package/civetweb/civetweb.mk
View File

@ -15,7 +15,7 @@ CIVETWEB_LIBS = -lpthread -lm
CIVETWEB_SYSCONFDIR = /etc CIVETWEB_SYSCONFDIR = /etc
CIVETWEB_HTMLDIR = /var/www CIVETWEB_HTMLDIR = /var/www
ifeq ($(BR2_CIVETWEB_WITH_LUA),y) ifeq ($(BR2_PACKAGE_CIVETWEB_WITH_LUA),y)
CIVETWEB_CONF_OPTS += WITH_LUA=1 CIVETWEB_CONF_OPTS += WITH_LUA=1
CIVETWEB_LIBS += -ldl CIVETWEB_LIBS += -ldl
endif endif