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: unbreak static linking builds

Browse Source 
Fixes
http://autobuild.buildroot.net/results/0a5/0a555a4ad0d100a7d402908b1f26d213de0ec127/
http://autobuild.buildroot.net/results/97b/97b014b2a611ba2528dda86bb05d6ffbec51c21d/
http://autobuild.buildroot.net/results/c2e/c2e314127be74a41bcdb78f04bc51fe2edef0b0f/
http://autobuild.buildroot.net/results/734/7346a89b5e7dd3633ecf9ac5292379ec9e832b2e/

And many more.

It is only the lua suboption that needs dlopen support, so adjust the
toolchain dependencies and CIVETWEB_LIBS handling to match.

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

4
package/civetweb/Config.in
View File

@ -12,11 +12,15 @@ if BR2_PACKAGE_CIVETWEB
config BR2_CIVETWEB_WITH_LUA config BR2_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
help help
Enable Lua support in Civetweb. Note that this will use a Enable Lua support in Civetweb. Note that this will use a
version of Lua and Sqlite bundled within the Civetweb version of Lua and Sqlite bundled within the Civetweb
sources, and not the packages from Buildroot. 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"

3
package/civetweb/civetweb.mk
View File

@ -11,12 +11,13 @@ CIVETWEB_LICENSE_FILES = LICENSE.md
CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1 CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1
CIVETWEB_COPT = $(TARGET_CFLAGS) -DHAVE_POSIX_FALLOCATE=0 CIVETWEB_COPT = $(TARGET_CFLAGS) -DHAVE_POSIX_FALLOCATE=0
CIVETWEB_LIBS = -lpthread -lm -ldl 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_CIVETWEB_WITH_LUA),y)
CIVETWEB_CONF_OPTS += WITH_LUA=1 CIVETWEB_CONF_OPTS += WITH_LUA=1
CIVETWEB_LIBS += -ldl
endif endif
ifeq ($(BR2_PACKAGE_OPENSSL),y) ifeq ($(BR2_PACKAGE_OPENSSL),y)