d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update buildroot to 2021.02.2 (#1370)

Browse Source
This commit is contained in:
Stefan Agner
2021-05-19 22:20:50 +02:00
committed by GitHub
parent 111018b911
commit c1c6a6ce21
247 changed files with 1386 additions and 1257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
buildroot/package/sconeserver/Config.in
View File

@@ -26,14 +26,6 @@ config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE
help
http::sconesite module for Sconeserver
config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE
bool "http::sconesite::image"
depends on BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE
depends on BR2_USE_MMU # imagemagick
select BR2_PACKAGE_IMAGEMAGICK
help
http::sconesite::image module for Sconeserver
config BR2_PACKAGE_SCONESERVER_MYSQL
bool "mysql"
depends on BR2_USE_MMU # mysql

15
buildroot/package/sconeserver/sconeserver.mk
View File

@@ -14,10 +14,16 @@ SCONESERVER_DEPENDENCIES = \
host-pkgconf \
$(if $(BR2_PACKAGE_PCRE),pcre) \
zlib
# disable image as it fails to build with ImageMagick
# disable markdown module because its git submodule cmark
# https://github.com/sconemad/sconeserver/tree/master/markdown
# has no cross-compile support provided by the sconeserver build system
SCONESERVER_CONF_OPTS += --with-ip --with-local --with-ip6 --without-markdown
SCONESERVER_CONF_OPTS += \
--with-ip \
--with-local \
--with-ip6 \
--without-image \
--without-markdown
# Sconeserver configure script fails to find the libxml2 headers.
ifeq ($(BR2_PACKAGE_LIBXML2),y)
@@ -45,13 +51,6 @@ else
SCONESERVER_CONF_OPTS += --without-sconesite
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE),y)
SCONESERVER_DEPENDENCIES += imagemagick
SCONESERVER_CONF_OPTS += --with-image
else
SCONESERVER_CONF_OPTS += --without-image
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y)
SCONESERVER_DEPENDENCIES += mysql
SCONESERVER_CONF_OPTS += \