NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/sconeserver: drop unrecognized options

Browse Source 
Drop Magick++-config, lettuce and ui options which are
not recognized since latest bump in commit
ca17e0c7a0 (back in 2018).

Indeed:
- Magick++-config is not used since
  b025999b8a
- Experimental UI and lettuce modules have been dropped since
  ccc1efdb89

Moreover, replace sconesite-image by image (broken since 2013 and
7693301fdb)

As UI and lettuce options are broken since a long time, it does not seem
useful to add entries in Config.in.legacy

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2021-03-03 19:12:27 +01:00 committed by Thomas Petazzoni
parent 252e7afb61
commit d3b818c3cf
2 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
package/sconeserver/Config.in
View File

@ -79,13 +79,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 +90,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"

19
package/sconeserver/sconeserver.mk
View File

@ -44,11 +44,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 +80,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 +93,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))