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

Update buildroot to 2021.02.1 (#1312)

Browse Source 
Signed-off-by: Stefan Agner <stefan@agner.ch>
This commit is contained in:
Stefan Agner
2021-04-08 15:51:24 +02:00
committed by GitHub
parent 40a705bbd3
commit aff28ce60e
411 changed files with 28197 additions and 879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,6 @@ menuconfig BR2_PACKAGE_SCONESERVER
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on !BR2_STATIC_LIBS # dlopen()
select BR2_PACKAGE_PCRE
select BR2_PACKAGE_ZLIB
help
Sconeserver is a modular, object-orientated and extremely
@@ -79,13 +78,6 @@ comment "location support needs a toolchain w/ theads, dynamic library"
depends on BR2_USE_MMU
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBRARY
config BR2_PACKAGE_SCONESERVER_LETTUCE
bool "lettuce"
help
Sconeserver module for Lettuce embedded automation platform
http://www.sconemad.com/lettuce/
config BR2_PACKAGE_SCONESERVER_MATHS
bool "maths"
select BR2_PACKAGE_MPFR
@@ -97,16 +89,6 @@ config BR2_PACKAGE_SCONESERVER_TESTBUILDER
help
Testbuilder module for Sconeserver
config BR2_PACKAGE_SCONESERVER_UI
bool "ui"
depends on BR2_PACKAGE_XORG7
select BR2_PACKAGE_XLIB_LIBX11
help
UI module for Sconeserver
comment "ui module requires X.org"
depends on !BR2_PACKAGE_XORG7
endif # BR2_PACKAGE_SCONESERVER
comment "sconeserver needs a toolchain with dynamic library, C++, NPTL"

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

@@ -10,7 +10,10 @@ SCONESERVER_LICENSE = GPL-2.0+
SCONESERVER_LICENSE_FILES = COPYING
# fetching from Git, we need to generate the configure script
SCONESERVER_AUTORECONF = YES
SCONESERVER_DEPENDENCIES = host-pkgconf pcre zlib
SCONESERVER_DEPENDENCIES = \
host-pkgconf \
$(if $(BR2_PACKAGE_PCRE),pcre) \
zlib
# 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
@@ -44,11 +47,9 @@ endif
ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE),y)
SCONESERVER_DEPENDENCIES += imagemagick
SCONESERVER_CONF_OPTS += \
--with-sconesite-image \
--with-Magick++-config="$(STAGING_DIR)/usr/bin/Magick++-config"
SCONESERVER_CONF_OPTS += --with-image
else
SCONESERVER_CONF_OPTS += --without-sconesite-image --with-Magick++-config=no
SCONESERVER_CONF_OPTS += --without-image
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y)
@@ -82,12 +83,6 @@ else
SCONESERVER_CONF_OPTS += --without-location
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_LETTUCE),y)
SCONESERVER_CONF_OPTS += --with-lettuce
else
SCONESERVER_CONF_OPTS += --without-lettuce
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_MATHS),y)
SCONESERVER_DEPENDENCIES += mpfr
SCONESERVER_CONF_OPTS += --with-maths
@@ -101,11 +96,4 @@ else
SCONESERVER_CONF_OPTS += --without-testbuilder
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_UI),y)
SCONESERVER_DEPENDENCIES += xlib_libX11
SCONESERVER_CONF_OPTS += --with-ui
else
SCONESERVER_CONF_OPTS += --without-ui
endif
$(eval $(autotools-package))